diff options
author | 2018-07-17 11:16:57 -0700 | |
---|---|---|
committer | 2018-07-17 11:16:57 -0700 | |
commit | a03e044aa198feaac79ae634b5244e69db7d826f (patch) | |
tree | 6901ecc80f12ac223cb5760b9f7d1b31edc589f1 /libs/gui/SurfaceComposerClient.cpp | |
parent | 836800931c463cfa105b0e454028dc884b899309 (diff) |
[gui] Modernize codebase by replacing NULL with nullptr
Fixes -Wzero-as-null-pointer-constant warning.
Test: m
Bug: 68236239
Change-Id: I7b39bde2d13690d46d96ae0e0737d19b11a1da9a
Diffstat (limited to 'libs/gui/SurfaceComposerClient.cpp')
-rw-r--r-- | libs/gui/SurfaceComposerClient.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp index d2b472b52f..fc076d2ea5 100644 --- a/libs/gui/SurfaceComposerClient.cpp +++ b/libs/gui/SurfaceComposerClient.cpp @@ -60,7 +60,7 @@ void ComposerService::connectLocked() { while (getService(name, &mComposerService) != NO_ERROR) { usleep(250000); } - assert(mComposerService != NULL); + assert(mComposerService != nullptr); // Create the death listener. class DeathObserver : public IBinder::DeathRecipient { @@ -83,7 +83,7 @@ void ComposerService::connectLocked() { Mutex::Autolock _l(instance.mLock); if (instance.mComposerService == nullptr) { ComposerService::getInstance().connectLocked(); - assert(instance.mComposerService != NULL); + assert(instance.mComposerService != nullptr); ALOGD("ComposerService reconnected"); } return instance.mComposerService; |