commit 7a1b5d5dec10f05ec29e7251ada440b47a34c6aa
author Aravind Akella <aakella@google.com> Wed Jun 24 15:34:59 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 24 15:34:59 2015 +0000
tree e6fdf860770ce882b904473106b8c9f90e9ba492
parent 0638a4fac7250e260c0102c770090cb7eefca936
parent ee155cadb23e84542cbf445c2aac89ae63df4cc7

Merge "Fix crash in SensorService. Ignore devices with no sensors." into mnc-dev

services/sensorservice/SensorService.cpp

diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index 45d467d..550107c 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -276,6 +276,8 @@
                 dev.enableAllSensors();
             }
             return status_t(NO_ERROR);
+        } else if (mSensorList.size() == 0) {
+            result.append("No Sensors on the device\n");
         } else {
             // Default dump the sensor list and debugging information.
             result.append("Sensor List:\n");