diff options
| author | 2018-06-08 12:44:44 -0700 | |
|---|---|---|
| committer | 2018-06-08 12:44:44 -0700 | |
| commit | aabd6b7fa343654cd85b3b2da392e424d037d15a (patch) | |
| tree | cbc9fea00e9b67d631bde2bbb70de5b151dfcadc /libs/binder/ProcessInfoService.cpp | |
| parent | 83af600986a41b38213e798bba8ea89ad0523096 (diff) | |
| parent | a800be8391e6c91501f6bedd48af1abdc63ede0d (diff) | |
Merge "[binder] Replace NULL/0 with nullptr"
am: a800be8391
Change-Id: I7e118d3def0f9643a79fa9003a89234340d941ea
Diffstat (limited to 'libs/binder/ProcessInfoService.cpp')
| -rw-r--r-- | libs/binder/ProcessInfoService.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/binder/ProcessInfoService.cpp b/libs/binder/ProcessInfoService.cpp index 8939d9c9b2..5cb2033b07 100644 --- a/libs/binder/ProcessInfoService.cpp +++ b/libs/binder/ProcessInfoService.cpp @@ -36,7 +36,7 @@ status_t ProcessInfoService::getProcessStatesImpl(size_t length, /*in*/ int32_t* for (int i = 0; i < BINDER_ATTEMPT_LIMIT; i++) { - if (pis != NULL) { + if (pis != nullptr) { err = pis->getProcessStatesFromPids(length, /*in*/ pids, /*out*/ states); if (err == NO_ERROR) return NO_ERROR; // success if (IInterface::asBinder(pis)->isBinderAlive()) return err; @@ -68,7 +68,7 @@ status_t ProcessInfoService::getProcessStatesScoresImpl(size_t length, for (int i = 0; i < BINDER_ATTEMPT_LIMIT; i++) { - if (pis != NULL) { + if (pis != nullptr) { err = pis->getProcessStatesAndOomScoresFromPids(length, /*in*/ pids, /*out*/ states, /*out*/ scores); if (err == NO_ERROR) return NO_ERROR; // success @@ -93,7 +93,7 @@ status_t ProcessInfoService::getProcessStatesScoresImpl(size_t length, void ProcessInfoService::updateBinderLocked() { const sp<IServiceManager> sm(defaultServiceManager()); - if (sm != NULL) { + if (sm != nullptr) { const String16 name("processinfo"); mProcessInfoService = interface_cast<IProcessInfoService>(sm->checkService(name)); } |