commit 2710a3cfa3a21829cf9b096d49ba1f66896285d0
author Martijn Coenen <maco@google.com> Tue Jun 26 01:05:12 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 26 01:05:12 2018 -0700
tree 0bd83ec4dd4b21720cd145607584d6450ecbfab1
parent 9285d7d9c7b65398972f48264a016b71197f84fb
parent 05ac1df6e8022222985e4845608c09e589e2fe99

Merge "Don't access system properties from vendor code." into pi-dev am: 07a988d103
am: 05ac1df6e8

Change-Id: I715087adfd24a32636382102d0a00a0d135d7cc7

libs/binder/IServiceManager.cpp

diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp
index 17e098c..d0ed31e 100644
--- a/libs/binder/IServiceManager.cpp
+++ b/libs/binder/IServiceManager.cpp
@@ -149,12 +149,13 @@
         const bool isVendorService =
             strcmp(ProcessState::self()->getDriverName().c_str(), "/dev/vndbinder") == 0;
         const long timeout = uptimeMillis() + 5000;
-        if (!gSystemBootCompleted) {
+        if (!gSystemBootCompleted && !isVendorService) {
+            // Vendor code can't access system properties
             char bootCompleted[PROPERTY_VALUE_MAX];
             property_get("sys.boot_completed", bootCompleted, "0");
             gSystemBootCompleted = strcmp(bootCompleted, "1") == 0 ? true : false;
         }
-        // retry interval in millisecond.
+        // retry interval in millisecond; note that vendor services stay at 100ms
         const long sleepTime = gSystemBootCompleted ? 1000 : 100;
 
         int n = 0;