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

Unverified Commit a3a55dad authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-9.0.0_r74' into staging/lineage-16.0_merge-android-security-9.0.0_r74 

Android security 9.0.0 release 74

* tag 'android-security-9.0.0_r74':
  libbinder: uptimeMillis returns int64_t!

Conflicts:
	libs/binder/IServiceManager.cpp

Change-Id: Ie5271ea883856c73457dd9cedcd4b7431ee46e97
parents b13f1d48 a5a6e17d

libs/binder/IServiceManager.cpp

+3 −2
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ public: 


        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();

        if (!gSystemBootCompleted && !isVendorService) {

            // Vendor code can't access system properties

            char bootCompleted[PROPERTY_VALUE_MAX];
@@ -158,7 +159,7 @@ public: 
        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());