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

Commit 2fc6b5f4 authored by Tom Cherry's avatar Tom Cherry Committed by Automerger Merge Worker
Browse files

Merge "libbinder: Log 'Waiting for service...' message outside of retry loop"... 

Merge "libbinder: Log 'Waiting for service...' message outside of retry loop" am: 6a284989 am: 9cc64273 am: e10c7fb4 am: d479d223 am: 83b8cc26

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1371558

Change-Id: Ifad36ad134248285749beeb187b71e9213e75c11
parents eb8942b3 83b8cc26

libs/binder/IServiceManager.cpp

+15 −7
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ 


#include <binder/IServiceManager.h>



#include <inttypes.h>

#include <unistd.h>



#include <android/os/BnServiceCallback.h>

#include <android/os/IServiceManager.h>

#include <binder/IPCThreadState.h>
@@ -36,8 +39,6 @@ 


#include "Static.h"



#include <unistd.h>



namespace android {



using AidlServiceManager = android::os::IServiceManager;
@@ -219,7 +220,8 @@ sp<IBinder> ServiceManagerShim::getService(const String16& name) const 


    const bool isVendorService =

        strcmp(ProcessState::self()->getDriverName().c_str(), "/dev/vndbinder") == 0;

    const long timeout = uptimeMillis() + 5000;

    const long timeout = 5000;

    int64_t startTime = uptimeMillis();

    // Vendor code can't access system properties

    if (!gSystemBootCompleted && !isVendorService) {

#ifdef __ANDROID__
@@ -233,15 +235,21 @@ sp<IBinder> ServiceManagerShim::getService(const String16& name) const 
    // retry interval in millisecond; note that vendor services stay at 100ms

    const long sleepTime = gSystemBootCompleted ? 1000 : 100;



    int n = 0;

    while (uptimeMillis() < timeout) {

        n++;

    ALOGI("Waiting for service '%s' on '%s'...", String8(name).string(),

          ProcessState::self()->getDriverName().c_str());



    int n = 0;

    while (uptimeMillis() - startTime < timeout) {

        n++;

        usleep(1000*sleepTime);



        sp<IBinder> svc = checkService(name);

        if (svc != nullptr) return svc;

        if (svc != nullptr) {

            ALOGI("Waiting for service '%s' on '%s' successful after waiting %" PRIi64 "ms",

                  String8(name).string(), ProcessState::self()->getDriverName().c_str(),

                  uptimeMillis() - startTime);

            return svc;

        }

    }

    ALOGW("Service %s didn't start. Returning NULL", String8(name).string());

    return nullptr;