summaryrefslogtreecommitdiff
path: root/libs/binder/ActivityManager.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/ActivityManager.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/ActivityManager.cpp')
-rw-r--r--libs/binder/ActivityManager.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/libs/binder/ActivityManager.cpp b/libs/binder/ActivityManager.cpp
index 2728f35408..28d0e4f9c3 100644
--- a/libs/binder/ActivityManager.cpp
+++ b/libs/binder/ActivityManager.cpp
@@ -34,16 +34,16 @@ sp<IActivityManager> ActivityManager::getService()
std::lock_guard<Mutex> scoped_lock(mLock);
int64_t startTime = 0;
sp<IActivityManager> service = mService;
- while (service == NULL || !IInterface::asBinder(service)->isBinderAlive()) {
+ while (service == nullptr || !IInterface::asBinder(service)->isBinderAlive()) {
sp<IBinder> binder = defaultServiceManager()->checkService(String16("activity"));
- if (binder == NULL) {
+ if (binder == nullptr) {
// Wait for the activity service to come back...
if (startTime == 0) {
startTime = uptimeMillis();
ALOGI("Waiting for activity service");
} else if ((uptimeMillis() - startTime) > 1000000) {
ALOGW("Waiting too long for activity service, giving up");
- service = NULL;
+ service = nullptr;
break;
}
usleep(25000);
@@ -58,7 +58,7 @@ sp<IActivityManager> ActivityManager::getService()
int ActivityManager::openContentUri(const String16& stringUri)
{
sp<IActivityManager> service = getService();
- return service != NULL ? service->openContentUri(stringUri) : -1;
+ return service != nullptr ? service->openContentUri(stringUri) : -1;
}
void ActivityManager::registerUidObserver(const sp<IUidObserver>& observer,
@@ -67,7 +67,7 @@ void ActivityManager::registerUidObserver(const sp<IUidObserver>& observer,
const String16& callingPackage)
{
sp<IActivityManager> service = getService();
- if (service != NULL) {
+ if (service != nullptr) {
service->registerUidObserver(observer, event, cutpoint, callingPackage);
}
}
@@ -75,7 +75,7 @@ void ActivityManager::registerUidObserver(const sp<IUidObserver>& observer,
void ActivityManager::unregisterUidObserver(const sp<IUidObserver>& observer)
{
sp<IActivityManager> service = getService();
- if (service != NULL) {
+ if (service != nullptr) {
service->unregisterUidObserver(observer);
}
}
@@ -83,7 +83,7 @@ void ActivityManager::unregisterUidObserver(const sp<IUidObserver>& observer)
bool ActivityManager::isUidActive(const uid_t uid, const String16& callingPackage)
{
sp<IActivityManager> service = getService();
- if (service != NULL) {
+ if (service != nullptr) {
return service->isUidActive(uid, callingPackage);
}
return false;
@@ -91,7 +91,7 @@ bool ActivityManager::isUidActive(const uid_t uid, const String16& callingPackag
status_t ActivityManager::linkToDeath(const sp<IBinder::DeathRecipient>& recipient) {
sp<IActivityManager> service = getService();
- if (service != NULL) {
+ if (service != nullptr) {
return IInterface::asBinder(service)->linkToDeath(recipient);
}
return INVALID_OPERATION;
@@ -99,7 +99,7 @@ status_t ActivityManager::linkToDeath(const sp<IBinder::DeathRecipient>& recipie
status_t ActivityManager::unlinkToDeath(const sp<IBinder::DeathRecipient>& recipient) {
sp<IActivityManager> service = getService();
- if (service != NULL) {
+ if (service != nullptr) {
return IInterface::asBinder(service)->unlinkToDeath(recipient);
}
return INVALID_OPERATION;