From 8ed24ceef30dd0bb92d6477b0eaa10367749068c Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Fri, 8 Jun 2018 17:15:29 -0700 Subject: resolve merge conflicts of aabd6b7fa343654cd85b3b2da392e424d037d15a to pi-dev-plus-aosp BUG: None Test: m checkbuild Change-Id: Iaea1d2481a1ef0e5b1d5ae404168fb42ed923d61 Merged-In: I3181bc5683796423a98b0f9b94daf30880c07bdc --- libs/binder/PermissionController.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libs/binder/PermissionController.cpp') diff --git a/libs/binder/PermissionController.cpp b/libs/binder/PermissionController.cpp index 96df33c9cf..34b2ca5170 100644 --- a/libs/binder/PermissionController.cpp +++ b/libs/binder/PermissionController.cpp @@ -41,7 +41,7 @@ sp PermissionController::getService() ALOGI("Waiting for permission service"); } else if ((uptimeMillis() - startTime) > 10000) { ALOGW("Waiting too long for permission service, giving up"); - service = NULL; + service = nullptr; break; } sleep(1); @@ -56,13 +56,13 @@ sp PermissionController::getService() bool PermissionController::checkPermission(const String16& permission, int32_t pid, int32_t uid) { sp service = getService(); - return service != NULL ? service->checkPermission(permission, pid, uid) : false; + return service != nullptr ? service->checkPermission(permission, pid, uid) : false; } int32_t PermissionController::noteOp(const String16& op, int32_t uid, const String16& packageName) { sp service = getService(); - return service != NULL ? service->noteOp(op, uid, packageName) : MODE_ERRORED; + return service != nullptr ? service->noteOp(op, uid, packageName) : MODE_ERRORED; } void PermissionController::getPackagesForUid(const uid_t uid, Vector &packages) -- cgit v1.2.3-59-g8ed1b