diff options
author | 2024-05-21 15:06:29 -0700 | |
---|---|---|
committer | 2024-06-27 12:04:32 -0700 | |
commit | 1d46f58320055b7aad551b92827bf3405258f25e (patch) | |
tree | c32caea58d088c49f3a1a51d8b880717fb9694d1 /libs/binder/PermissionController.cpp | |
parent | 5e1cbe06681051d7e121364b36469acbdb24fdbe (diff) |
Migrate from libutils SystemClock.h to std::chrono
Bug: 341997808
Test: mma
Change-Id: Ib4d60eeaaac73566cc79d473f6551e9abd20e69a
Diffstat (limited to 'libs/binder/PermissionController.cpp')
-rw-r--r-- | libs/binder/PermissionController.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/binder/PermissionController.cpp b/libs/binder/PermissionController.cpp index 0c8924503d..c11eb7df42 100644 --- a/libs/binder/PermissionController.cpp +++ b/libs/binder/PermissionController.cpp @@ -19,10 +19,10 @@ #include <binder/Binder.h> #include <binder/IServiceManager.h> -#include <utils/SystemClock.h> - namespace android { +using namespace std::chrono_literals; + PermissionController::PermissionController() { } @@ -30,16 +30,16 @@ PermissionController::PermissionController() sp<IPermissionController> PermissionController::getService() { std::lock_guard<Mutex> scoped_lock(mLock); - int64_t startTime = 0; + auto startTime = std::chrono::steady_clock::now().min(); sp<IPermissionController> service = mService; while (service == nullptr || !IInterface::asBinder(service)->isBinderAlive()) { sp<IBinder> binder = defaultServiceManager()->checkService(String16("permission")); if (binder == nullptr) { // Wait for the activity service to come back... - if (startTime == 0) { - startTime = uptimeMillis(); + if (startTime == startTime.min()) { + startTime = std::chrono::steady_clock::now(); ALOGI("Waiting for permission service"); - } else if ((uptimeMillis() - startTime) > 10000) { + } else if (std::chrono::steady_clock::now() - startTime > 10s) { ALOGW("Waiting too long for permission service, giving up"); service = nullptr; break; |