commit 5ea7ea44a23d0ab81f24eb290840db10d766b122
author Michael Wright <michaelwr@google.com> Thu Jul 23 16:32:02 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 23 16:32:02 2015 +0000
tree bcb0d1f18d3f63c548a4e91a83397af9763f90f2
parent e6406e3589fa490bfa435384d2a3a6ac678e08fd
parent e6f6ad04ed1e0e73fc260a0100d5759a0456fdd6

Merge "DO NOT MERGE. Cancel touches as well as pointer gestures." into cw-d-mr1-dev

services/sensorservice/SensorService.cpp

diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index c316ef6..30ec458 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -82,7 +82,7 @@
         ssize_t count = dev.getSensorList(&list);
         if (count > 0) {
             ssize_t orientationIndex = -1;
-            bool hasGyro = false;
+            bool hasGyro = false, hasAccel = false, hasMag = false;
             uint32_t virtualSensorsNeeds =
                     (1<<SENSOR_TYPE_GRAVITY) |
                     (1<<SENSOR_TYPE_LINEAR_ACCELERATION) |
@@ -92,6 +92,12 @@
             for (ssize_t i=0 ; i<count ; i++) {
                 registerSensor( new HardwareSensor(list[i]) );
                 switch (list[i].type) {
+                    case SENSOR_TYPE_ACCELEROMETER:
+                        hasAccel = true;
+                        break;
+                    case SENSOR_TYPE_MAGNETIC_FIELD:
+                        hasMag = true;
+                        break;
                     case SENSOR_TYPE_ORIENTATION:
                         orientationIndex = i;
                         break;
@@ -115,7 +121,7 @@
             // build the sensor list returned to users
             mUserSensorList = mSensorList;
 
-            if (hasGyro) {
+            if (hasGyro && hasAccel && hasMag) {
                 Sensor aSensor;
 
                 // Add Android virtual sensors if they're not already