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

Commit d21fe395 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

libbinder: uptimeMillis returns int64_t! am: 3ba4963f am: 17aa765f am:... 

libbinder: uptimeMillis returns int64_t! am: 3ba4963f am: 17aa765f am: d666af69 am: 62eaabc3

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

Change-Id: I53b504bbb6299988939674ba2b21344569c0da6d
parents 8532cf70 62eaabc3

libs/binder/IServiceManager.cpp

+3 −2
Original line number Diff line number Diff line
@@ -215,7 +215,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__
@@ -230,7 +231,7 @@ sp<IBinder> ServiceManagerShim::getService(const String16& name) const 
    const long sleepTime = gSystemBootCompleted ? 1000 : 100;



    int n = 0;

    while (uptimeMillis() < timeout) {

    while (uptimeMillis() - startTime < timeout) {

        n++;

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

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