commit ffef668d287be9691ec6082f532c02439a9e3204
author Arthur Ishiguro <arthuri@google.com> Sat Dec 25 17:31:17 2021 +0000
committer Arthur Ishiguro <arthuri@google.com> Sat Dec 25 23:37:45 2021 +0000
tree 0f4bf80a3a7860b8b9dd11928ce2ccb58ed0d79b
parent 914371c4bce9fc0fc2bcb6385a272f7457fc9c51

Fix sp ownership in HidlSensorHalWrapper

Also rename SensorsCallback to distinguish from upcoming
AIDL SensorsCallback.

Bug: 195593357
Test: Load on device
Change-Id: Ib000849ffdad43e896538df9f632f04804ce30de

services/sensorservice/HidlSensorHalWrapper.cpp

diff --git a/services/sensorservice/HidlSensorHalWrapper.cpp b/services/sensorservice/HidlSensorHalWrapper.cpp
index dbb3da1..a488eab 100644
--- a/services/sensorservice/HidlSensorHalWrapper.cpp
+++ b/services/sensorservice/HidlSensorHalWrapper.cpp
@@ -76,11 +76,11 @@
     mHidlSensorHalWrapper->prepareForReconnect();
 }
 
-struct SensorsCallback : public ISensorsCallback {
+struct HidlSensorsCallback : public ISensorsCallback {
     using Result = ::android::hardware::sensors::V1_0::Result;
     using SensorInfo = ::android::hardware::sensors::V2_1::SensorInfo;
 
-    SensorsCallback(ISensorHalWrapper::SensorDeviceCallback* sensorDeviceCallback) {
+    HidlSensorsCallback(ISensorHalWrapper::SensorDeviceCallback* sensorDeviceCallback) {
         mSensorDeviceCallback = sensorDeviceCallback;
     }
 
@@ -482,7 +482,7 @@
     CHECK(mSensors != nullptr && mWakeLockQueue != nullptr && mEventQueueFlag != nullptr &&
           mWakeLockQueueFlag != nullptr);
 
-    mCallback = new SensorsCallback(mSensorDeviceCallback);
+    mCallback = sp<HidlSensorsCallback>::make(mSensorDeviceCallback);
     status_t status =
             checkReturnAndGetStatus(mSensors->initialize(*mWakeLockQueue->getDesc(), mCallback));