summaryrefslogtreecommitdiff
path: root/libs/binder/PermissionController.cpp
diff options
context:
space:
mode:
author Yi Kong <yikong@google.com> 2018-06-07 14:38:36 -0700
committer Yi Kong <yikong@google.com> 2018-06-07 14:38:36 -0700
commit91635563b8a1bf7a31e4ceb439728dacb79abd76 (patch)
tree76e42555fb1da0a173a8d14a77d8679d926f53d8 /libs/binder/PermissionController.cpp
parentfdcfb671b1a8750153ae9549c2cecf219569995a (diff)
[binder] Replace NULL/0 with nullptr
Fixes -Wzero-as-null-pointer-constant warning. clang-tidy -checks=modernize-use-nullptr -p compile_commands.json -fix ... Test: m Bug: 68236239 Change-Id: I3181bc5683796423a98b0f9b94daf30880c07bdc
Diffstat (limited to 'libs/binder/PermissionController.cpp')
-rw-r--r--libs/binder/PermissionController.cpp6
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)