commit ccbcaaee457c63582142c84d0e779793d71905b1
author Brian Duddie <bduddie@google.com> Wed Jun 19 16:24:15 2019 -0700
committer Brian Duddie <bduddie@google.com> Thu Jun 20 13:36:43 2019 -0700
tree f4fda9bb7643444cadb35de144b7ab626d008534
parent 56d64faff7e56bc355cce2793f51771981252644

Fix NPD in GrallocWrapper

Avoid dereferencing null if mapper service is not available.

Bug: 135638664
Test: run VtsHalSensorsV2_0TargetTest
Change-Id: I3cf2a9f152d8f1737cb5a94356e252d54156c716

sensors/common/vts/utils/GrallocWrapper.cpp

diff --git a/sensors/common/vts/utils/GrallocWrapper.cpp b/sensors/common/vts/utils/GrallocWrapper.cpp
index 153c208..222ef96 100644
--- a/sensors/common/vts/utils/GrallocWrapper.cpp
+++ b/sensors/common/vts/utils/GrallocWrapper.cpp
@@ -33,8 +33,7 @@
     mMapper = mapper2::IMapper::getService();
     if (mMapper == nullptr) {
         ALOGE("Failed to get mapper service");
-    }
-    if (mMapper->isRemote()) {
+    } else if (mMapper->isRemote()) {
         ALOGE("Mapper is not in passthrough mode");
     }
 }