Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1927afe authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge changes Ie10042ca,Ic5203951 am: d519d9c7 

am: a9bc7ee4

Change-Id: I699b980a4115797b7ed67e1741c1b70c019fdcbc
parents 97875081 a9bc7ee4

libs/binder/IServiceManager.cpp

+2 −6
Original line number Diff line number Diff line
@@ -161,12 +161,8 @@ public: 
        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);