commit ad6cd42e9c7aaf75fd5e4f2f6991b89a925a566c
author Ashutosh Joshi <ashutoshj@google.com> Wed Feb 03 15:01:41 2016 -0800
committer Ashutosh Joshi <ashutoshj@google.com> Wed Feb 03 23:40:19 2016 +0000
tree a4d9c090b42341b8efc2203beb0bcf962fc22e7a
parent e80d58db65d29ed4647e631a81aed644fea00913

Stop supporting old Sensor HAL versions.

Dropping support for Sensor HAL version 1.0.
HAL versions 1.1 and 1.2 were deprecated already.
HAL versions 1.3 and above are now required.

Change-Id: I387ca47d419631b5e882c05464a6e90fb6ec731b

services/sensorservice/SensorDevice.cpp

diff --git a/services/sensorservice/SensorDevice.cpp b/services/sensorservice/SensorDevice.cpp
index 179b1c5..082f0f8 100644
--- a/services/sensorservice/SensorDevice.cpp
+++ b/services/sensorservice/SensorDevice.cpp
@@ -54,13 +54,15 @@
                 SENSORS_HARDWARE_MODULE_ID, strerror(-err));
 
         if (mSensorDevice) {
-            if (mSensorDevice->common.version == SENSORS_DEVICE_API_VERSION_1_1 ||
-                mSensorDevice->common.version == SENSORS_DEVICE_API_VERSION_1_2) {
-                ALOGE(">>>> WARNING <<< Upgrade sensor HAL to version 1_3");
-            }
 
             sensor_t const* list;
             ssize_t count = mSensorModule->get_sensors_list(mSensorModule, &list);
+
+            if (mSensorDevice->common.version < SENSORS_DEVICE_API_VERSION_1_3) {
+                ALOGE(">>>> WARNING <<< Upgrade sensor HAL to version 1_3, ignoring sensors reported by this device");
+                count = 0;
+            }
+
             mActivationCount.setCapacity(count);
             Info model;
             for (size_t i=0 ; i<size_t(count) ; i++) {