diff options
| author | 2020-11-17 01:49:54 +0000 | |
|---|---|---|
| committer | 2020-11-17 01:49:54 +0000 | |
| commit | 4c2eeff7b3ce2b467e8d4efda9e0a4fc66bbf704 (patch) | |
| tree | f7a6dbc93b840f04b780610cdd1c31a45169ca3e /libs/binder/IServiceManager.cpp | |
| parent | 2768a7b6ba4a3eb148f802241633e5ba562dc8f2 (diff) | |
| parent | 6140d46d41f549ceff103e42270d0ada57705117 (diff) | |
Merge changes I89779ab3,I63ec0e57 am: 6c8e3812b9 am: f39786af24 am: 6140d46d41
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1498600
Change-Id: If96621b20c0847afd6f52f10c80f1592012b2e73
Diffstat (limited to 'libs/binder/IServiceManager.cpp')
| -rw-r--r-- | libs/binder/IServiceManager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp index 35e642deb2..ca067e2d7f 100644 --- a/libs/binder/IServiceManager.cpp +++ b/libs/binder/IServiceManager.cpp @@ -221,7 +221,7 @@ sp<IBinder> ServiceManagerShim::getService(const String16& name) const const bool isVendorService = strcmp(ProcessState::self()->getDriverName().c_str(), "/dev/vndbinder") == 0; - const long timeout = 5000; + constexpr int64_t timeout = 5000; int64_t startTime = uptimeMillis(); // Vendor code can't access system properties if (!gSystemBootCompleted && !isVendorService) { @@ -234,7 +234,7 @@ sp<IBinder> ServiceManagerShim::getService(const String16& name) const #endif } // retry interval in millisecond; note that vendor services stay at 100ms - const long sleepTime = gSystemBootCompleted ? 1000 : 100; + const useconds_t sleepTime = gSystemBootCompleted ? 1000 : 100; ALOGI("Waiting for service '%s' on '%s'...", String8(name).string(), ProcessState::self()->getDriverName().c_str()); |