Merge "Merge Android Pie into master"

1 files changed, 6 insertions, 6 deletions

diff --git a/libs/gui/DisplayEventReceiver.cpp b/libs/gui/DisplayEventReceiver.cpp
index f5cf1c4d5a..1757ec1cd3 100644
--- a/libs/gui/DisplayEventReceiver.cpp
+++ b/libs/gui/DisplayEventReceiver.cpp
@@ -34,9 +34,9 @@ namespace android {
 
 DisplayEventReceiver::DisplayEventReceiver(ISurfaceComposer::VsyncSource vsyncSource) {
     sp<ISurfaceComposer> sf(ComposerService::getComposerService());
-    if (sf != nullptr) {
+    if (sf != NULL) {
         mEventConnection = sf->createDisplayEventConnection(vsyncSource);
-        if (mEventConnection != nullptr) {
+        if (mEventConnection != NULL) {
             mDataChannel = std::make_unique<gui::BitTube>();
             mEventConnection->stealReceiveChannel(mDataChannel.get());
         }
@@ -47,13 +47,13 @@ DisplayEventReceiver::~DisplayEventReceiver() {
 }
 
 status_t DisplayEventReceiver::initCheck() const {
-    if (mDataChannel != nullptr)
+    if (mDataChannel != NULL)
         return NO_ERROR;
     return NO_INIT;
 }
 
 int DisplayEventReceiver::getFd() const {
-    if (mDataChannel == nullptr)
+    if (mDataChannel == NULL)
         return NO_INIT;
 
     return mDataChannel->getFd();
@@ -63,7 +63,7 @@ status_t DisplayEventReceiver::setVsyncRate(uint32_t count) {
     if (int32_t(count) < 0)
         return BAD_VALUE;
 
-    if (mEventConnection != nullptr) {
+    if (mEventConnection != NULL) {
         mEventConnection->setVsyncRate(count);
         return NO_ERROR;
     }
@@ -71,7 +71,7 @@ status_t DisplayEventReceiver::setVsyncRate(uint32_t count) {
 }
 
 status_t DisplayEventReceiver::requestNextVsync() {
-    if (mEventConnection != nullptr) {
+    if (mEventConnection != NULL) {
         mEventConnection->requestNextVsync();
         return NO_ERROR;
     }