summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Grace Cheng <gracemc@google.com> 2021-12-15 13:23:22 +0000
committer Grace Cheng <gracemc@google.com> 2021-12-15 13:32:05 +0000
commit8cf4b61bc0455f8dd90dbdfdf1e4554c70b0c06a (patch)
treed4d265496008352896599ad4283f1dea47129df0
parent3d0bcf18becba3ffc6dd631d6efa35a5dc9d50a0 (diff)
Trims dead code
Bug: 195593357 Test: manually Change-Id: Ie84cfeaa1e76eb238e317ae06fac3cd3c1ff2c95
-rw-r--r--services/sensorservice/HidlSensorHalWrapper.cpp23
-rw-r--r--services/sensorservice/HidlSensorHalWrapper.h6
-rw-r--r--services/sensorservice/ISensorHalWrapper.h5
3 files changed, 0 insertions, 34 deletions
diff --git a/services/sensorservice/HidlSensorHalWrapper.cpp b/services/sensorservice/HidlSensorHalWrapper.cpp
index f64a827196..dbb3da19a6 100644
--- a/services/sensorservice/HidlSensorHalWrapper.cpp
+++ b/services/sensorservice/HidlSensorHalWrapper.cpp
@@ -374,29 +374,6 @@ void HidlSensorHalWrapper::writeWakeLockHandled(uint32_t count) {
}
}
-void HidlSensorHalWrapper::onDynamicSensorsConnected(
- const std::vector<sensor_t>& dynamicSensorsAdded) {
- std::unique_lock<std::mutex> lock(mDynamicSensorsMutex);
-
- // Allocate a sensor_t structure for each dynamic sensor added and insert
- // it into the dictionary of connected dynamic sensors keyed by handle.
- for (size_t i = 0; i < dynamicSensorsAdded.size(); ++i) {
- const sensor_t& sensor = dynamicSensorsAdded[i];
-
- auto it = mConnectedDynamicSensors.find(sensor.handle);
- CHECK(it == mConnectedDynamicSensors.end());
-
- mConnectedDynamicSensors.insert(std::make_pair(sensor.handle, sensor));
- }
-
- mDynamicSensorsCv.notify_all();
-}
-
-void HidlSensorHalWrapper::onDynamicSensorsDisconnected(
- const std::vector<int32_t>& /*dynamicSensorHandlesRemoved*/) {
- // TODO: Currently dynamic sensors do not seem to be removed
-}
-
status_t HidlSensorHalWrapper::checkReturnAndGetStatus(const hardware::Return<Result>& ret) {
checkReturn(ret);
return (!ret.isOk()) ? DEAD_OBJECT : statusFromResult(ret);
diff --git a/services/sensorservice/HidlSensorHalWrapper.h b/services/sensorservice/HidlSensorHalWrapper.h
index 6542c6acf9..f64e13d025 100644
--- a/services/sensorservice/HidlSensorHalWrapper.h
+++ b/services/sensorservice/HidlSensorHalWrapper.h
@@ -118,12 +118,6 @@ public:
virtual status_t configureDirectChannel(int32_t sensorHandle, int32_t channelHandle,
const struct sensors_direct_cfg_t* config) override;
- virtual void onDynamicSensorsConnected(
- const std::vector<sensor_t>& dynamicSensorsAdded) override;
-
- virtual void onDynamicSensorsDisconnected(
- const std::vector<int32_t>& dynamicSensorHandlesRemoved) override;
-
virtual void writeWakeLockHandled(uint32_t count) override;
private:
diff --git a/services/sensorservice/ISensorHalWrapper.h b/services/sensorservice/ISensorHalWrapper.h
index 7a51685862..3d33540c18 100644
--- a/services/sensorservice/ISensorHalWrapper.h
+++ b/services/sensorservice/ISensorHalWrapper.h
@@ -94,11 +94,6 @@ public:
virtual status_t configureDirectChannel(int32_t sensorHandle, int32_t channelHandle,
const struct sensors_direct_cfg_t *config) = 0;
- virtual void onDynamicSensorsConnected(const std::vector<sensor_t> &dynamicSensorsAdded) = 0;
-
- virtual void onDynamicSensorsDisconnected(
- const std::vector<int32_t> &dynamicSensorHandlesRemoved) = 0;
-
virtual void writeWakeLockHandled(uint32_t count) = 0;
std::atomic_bool mReconnecting = false;