commit 7359a586b71d51527bf704766a2117d6227ec198
author Arthur Ishiguro <arthuri@google.com> Wed Dec 29 17:49:20 2021 +0000
committer Arthur Ishiguro <arthuri@google.com> Wed Dec 29 17:49:20 2021 +0000
tree 631c92260c16c7decd13f0ee9e3cbc513c1ac9e3
parent 914371c4bce9fc0fc2bcb6385a272f7457fc9c51

Add null-pointer check for mHalWrapper

Bug: 211012923
Test: None
Change-Id: Ibb321a4abe11406268093664ca9df5d3a5e8a237

services/sensorservice/SensorDevice.cpp

diff --git a/services/sensorservice/SensorDevice.cpp b/services/sensorservice/SensorDevice.cpp
index 84a1076..ee621d6 100644
--- a/services/sensorservice/SensorDevice.cpp
+++ b/services/sensorservice/SensorDevice.cpp
@@ -572,6 +572,7 @@
 }
 
 status_t SensorDevice::flush(void* /*ident*/, int handle) {
+    if (mHalWrapper == nullptr) return NO_INIT;
     return mHalWrapper->flush(handle);
 }
 
@@ -711,6 +712,7 @@
 }
 
 status_t SensorDevice::injectSensorData(const sensors_event_t* injected_sensor_event) {
+    if (mHalWrapper == nullptr) return NO_INIT;
     return mHalWrapper->injectSensorData(injected_sensor_event);
 }
 
@@ -720,6 +722,7 @@
 }
 
 int32_t SensorDevice::registerDirectChannel(const sensors_direct_mem_t* memory) {
+    if (mHalWrapper == nullptr) return NO_INIT;
     Mutex::Autolock _l(mLock);
 
     return mHalWrapper->registerDirectChannel(memory, nullptr);
@@ -731,6 +734,7 @@
 
 int32_t SensorDevice::configureDirectChannel(int32_t sensorHandle, int32_t channelHandle,
                                              const struct sensors_direct_cfg_t* config) {
+    if (mHalWrapper == nullptr) return NO_INIT;
     Mutex::Autolock _l(mLock);
 
     return mHalWrapper->configureDirectChannel(sensorHandle, channelHandle, config);