commit | 7dbff392447752d6bc749868ecf93e51e740384f | [log] [tgz] |
---|---|---|
author | Brian Duddie <bduddie@google.com> | Wed Jun 19 16:24:15 2019 -0700 |
committer | Anthony Stange <stange@google.com> | Thu Oct 31 09:13:30 2019 -0400 |
tree | 941dbd2339e429b1177cb5fa82228e758276cec8 | |
parent | e832ff407238b587ecaebfcc3d36b2904337bf0e [diff] |
Fix NPD in GrallocWrapper Avoid dereferencing null if mapper service is not available. Bug: 136736906 Test: run VtsHalSensorsV2_0TargetTest Change-Id: I3cf2a9f152d8f1737cb5a94356e252d54156c716 Merged-In: I3cf2a9f152d8f1737cb5a94356e252d54156c716 (cherry picked from commit ccbcaaee457c63582142c84d0e779793d71905b1)
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"); } }