summaryrefslogtreecommitdiffstats
path: root/sensors
diff options
context:
space:
mode:
authorBrian Duddie <bduddie@google.com>2019-06-19 16:24:15 -0700
committerBrian Duddie <bduddie@google.com>2019-06-20 13:36:43 -0700
commitccbcaaee457c63582142c84d0e779793d71905b1 (patch)
treef4fda9bb7643444cadb35de144b7ab626d008534 /sensors
parent56d64faff7e56bc355cce2793f51771981252644 (diff)
downloadandroid_hardware_interfaces-ccbcaaee457c63582142c84d0e779793d71905b1.tar.gz
android_hardware_interfaces-ccbcaaee457c63582142c84d0e779793d71905b1.tar.bz2
android_hardware_interfaces-ccbcaaee457c63582142c84d0e779793d71905b1.zip
Fix NPD in GrallocWrapper
Avoid dereferencing null if mapper service is not available. Bug: 135638664 Test: run VtsHalSensorsV2_0TargetTest Change-Id: I3cf2a9f152d8f1737cb5a94356e252d54156c716
Diffstat (limited to 'sensors')
-rw-r--r--sensors/common/vts/utils/GrallocWrapper.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/sensors/common/vts/utils/GrallocWrapper.cpp b/sensors/common/vts/utils/GrallocWrapper.cpp
index 153c208b7..222ef9611 100644
--- a/sensors/common/vts/utils/GrallocWrapper.cpp
+++ b/sensors/common/vts/utils/GrallocWrapper.cpp
@@ -33,8 +33,7 @@ void GrallocWrapper::init() {
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");
}
}