commit 712fe62ab282b3897fc1ee98e35b12d95663be52
author Christopher Wiley <wiley@google.com> Fri Feb 12 23:43:00 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 12 23:43:00 2016 +0000
tree 7e3ee73048a677f545ec8156aabb6b71491b82bc
parent dda39f2a2229ea74cc4738daa1c6a1c758284d7d
parent 6dd4552614e0dcddeefde322185fe118f175fa47

Merge "Fix race in AppOpsManager client library"

libs/binder/AppOpsManager.cpp

diff --git a/libs/binder/AppOpsManager.cpp b/libs/binder/AppOpsManager.cpp
index e4d8201..f8626cb 100644
--- a/libs/binder/AppOpsManager.cpp
+++ b/libs/binder/AppOpsManager.cpp
@@ -53,7 +53,8 @@
                 ALOGI("Waiting for app ops service");
             } else if ((uptimeMillis()-startTime) > 10000) {
                 ALOGW("Waiting too long for app ops service, giving up");
-                return NULL;
+                service = NULL;
+                break;
             }
             sleep(1);
         } else {