From 16c6e7073231dc9e9a775acb5aa5c456ca38851f Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 13 Nov 2020 20:53:12 +0900 Subject: binder: fix google-runtime-int Bug: 162909698 Test: m libbinder Change-Id: I63ec0e57166a97711d254156bde04ffe155465a5 --- libs/binder/IServiceManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs/binder/IServiceManager.cpp') 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 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 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()); -- cgit v1.2.3-59-g8ed1b