diff options
Diffstat (limited to 'libs/binder/PermissionController.cpp')
| -rw-r--r-- | libs/binder/PermissionController.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<IPermissionController> 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<IPermissionController> PermissionController::getService() bool PermissionController::checkPermission(const String16& permission, int32_t pid, int32_t uid) { sp<IPermissionController> 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<IPermissionController> 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<String16> &packages) |