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

Commit 70fc20c2 authored by Christopher Wiley's avatar Christopher Wiley Committed by android-build-merger
Browse files

Merge "Fix race in AppOpsManager client library" am: 712fe62a 

am: f2936d7b

* commit 'f2936d7b':
  Fix race in AppOpsManager client library
parents 23d6feba f2936d7b

libs/binder/AppOpsManager.cpp

+2 −1
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ sp<IAppOpsService> AppOpsManager::getService() 
                ALOGI("Waiting for app ops service");

            } else if ((uptimeMillis()-startTime) > 10000) {

                ALOGW("Waiting too long for app ops service, giving up");

                return NULL;

                service = NULL;

                break;

            }

            sleep(1);

        } else {