commit 05ac1df6e8022222985e4845608c09e589e2fe99
author Martijn Coenen <maco@google.com> Tue Jun 26 00:58:10 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 26 00:58:10 2018 -0700
tree 9cdc4ac546452f0807398e6b78c9656573771a9e
parent 6e5c2b5917505a300aafeb0930ea7a540aa16c6f
parent 07a988d103fd5e70ccb7832d03d5d571c3f35574

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

Change-Id: Iac0ce9ae382019a892a116de522104f69a09f21e

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;