commit 3dcf0cf34e14f893055c66745e5a639922287e41
author Yifan Hong <elsk@google.com> Fri Mar 17 00:40:18 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 17 00:40:18 2017 +0000
tree ea25269e4abebcc33db508858cf7f8417d7498ca
parent 80bde02a060c69d85d2cf395d0735945db9e7da6
parent 8fb656b8ad63536bb8a16548fc33c6a2f3e0435b

defaultServiceManager locks before check.
am: 8fb656b8ad

Change-Id: I2df7177c0d30224d034da8099671e505503aff0f

transport/ServiceManagement.cpp

diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp
index 15abb92..feef01f 100644
--- a/transport/ServiceManagement.cpp
+++ b/transport/ServiceManagement.cpp
@@ -53,19 +53,23 @@
 
 sp<IServiceManager> defaultServiceManager() {
 
-    if (gDefaultServiceManager != NULL) return gDefaultServiceManager;
-    if (access("/dev/hwbinder", F_OK|R_OK|W_OK) != 0) {
-        // HwBinder not available on this device or not accessible to
-        // this process.
-        return nullptr;
-    }
     {
         AutoMutex _l(gDefaultServiceManagerLock);
+        if (gDefaultServiceManager != NULL) {
+            return gDefaultServiceManager;
+        }
+        if (access("/dev/hwbinder", F_OK|R_OK|W_OK) != 0) {
+            // HwBinder not available on this device or not accessible to
+            // this process.
+            return nullptr;
+        }
         while (gDefaultServiceManager == NULL) {
-            gDefaultServiceManager = fromBinder<IServiceManager, BpHwServiceManager, BnHwServiceManager>(
-                ProcessState::self()->getContextObject(NULL));
-            if (gDefaultServiceManager == NULL)
+            gDefaultServiceManager =
+                    fromBinder<IServiceManager, BpHwServiceManager, BnHwServiceManager>(
+                        ProcessState::self()->getContextObject(NULL));
+            if (gDefaultServiceManager == NULL) {
                 sleep(1);
+            }
         }
     }