commit 7869e224aaaf717b5ab86df00b60fd5be5a0996c
author Sean Wan <swan@google.com> Mon Jul 14 17:07:33 2014 -0700
committer Sean Wan <swan@google.com> Tue Jul 15 11:10:44 2014 -0700
tree 96e4e0ad14a6c37083870310d46e8ac3653e8615
parent 2a0e40945b5f7adf2055b2f439b3ba4c6389ddc3

CW on L: Fix a SIGSEGV crash in sensor service.

This is to fix b/16189080.

BUG: 16189080
Change-Id: I78d44e82f797c0808891acde609040c46745a0bb

services/sensorservice/SensorService.cpp

diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index f5dba38..6468017 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -490,8 +490,12 @@
 }
 
 bool SensorService::isWakeUpSensorEvent(const sensors_event_t& event) const {
-    SensorInterface* sensor = mSensorMap.valueFor(event.sensor);
-    return sensor->getSensor().isWakeUpSensor();
+    int handle = event.sensor;
+    if (event.type == SENSOR_TYPE_META_DATA) {
+        handle = event.meta_data.sensor;
+    }
+    SensorInterface* sensor = mSensorMap.valueFor(handle);
+    return sensor != NULL && sensor->getSensor().isWakeUpSensor();
 }
 
 Vector<Sensor> SensorService::getSensorList()