commit c1927afefc6e75b03ae5663c08de07edae3bf8f5
author Steven Moreland <smoreland@google.com> Wed Aug 08 10:47:04 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 08 10:47:04 2018 -0700
tree 7fd73bfe3d8943f897ddf767026748dae82982ed
parent 9787508175ab856672cc1de6b0b3da86d52852ca
parent a9bc7ee4ed6aee86d69c1c8cf1fdb0e8a027ae09

Merge changes Ie10042ca,Ic5203951 am: d519d9c79f
am: a9bc7ee4ed

Change-Id: I699b980a4115797b7ed67e1741c1b70c019fdcbc

libs/binder/IServiceManager.cpp

diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp
index d0ed31e..c44a17e 100644
--- a/libs/binder/IServiceManager.cpp
+++ b/libs/binder/IServiceManager.cpp
@@ -161,12 +161,8 @@
         int n = 0;
         while (uptimeMillis() < timeout) {
             n++;
-            if (isVendorService) {
-                ALOGI("Waiting for vendor service %s...", String8(name).string());
-                CallStack stack(LOG_TAG);
-            } else if (n%10 == 0) {
-                ALOGI("Waiting for service %s...", String8(name).string());
-            }
+            ALOGI("Waiting for service '%s' on '%s'...", String8(name).string(),
+                ProcessState::self()->getDriverName().c_str());
             usleep(1000*sleepTime);
 
             sp<IBinder> svc = checkService(name);