From cf18953cbfa8c30248334e1ce11d2fcf011b0548 Mon Sep 17 00:00:00 2001 From: Ashutosh Joshi Date: Wed, 22 Mar 2017 21:25:13 -0700 Subject: [PATCH] Fix the maximum value of sensor types Sensors which should have a maximum vector length of 1 were erroneously being treated as tri-axis sensors. Bug: 36530209 Test: Ensure that pressure, light, ambient temperature, proximity, relative humidity, temperature are reported with maximum length of 1. Change-Id: Iec76a6b8a2c1851300e92b71c46f2f12836fa7bf --- core/java/android/hardware/Sensor.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/java/android/hardware/Sensor.java b/core/java/android/hardware/Sensor.java index 8c13cc893cc7..0218cb5f3058 100644 --- a/core/java/android/hardware/Sensor.java +++ b/core/java/android/hardware/Sensor.java @@ -771,15 +771,15 @@ public final class Sensor { 3, // SENSOR_TYPE_GEOMAGNETIC_FIELD 3, // SENSOR_TYPE_ORIENTATION 3, // SENSOR_TYPE_GYROSCOPE - 3, // SENSOR_TYPE_LIGHT - 3, // SENSOR_TYPE_PRESSURE - 3, // SENSOR_TYPE_TEMPERATURE - 3, // SENSOR_TYPE_PROXIMITY + 1, // SENSOR_TYPE_LIGHT + 1, // SENSOR_TYPE_PRESSURE + 1, // SENSOR_TYPE_TEMPERATURE + 1, // SENSOR_TYPE_PROXIMITY 3, // SENSOR_TYPE_GRAVITY 3, // SENSOR_TYPE_LINEAR_ACCELERATION 5, // SENSOR_TYPE_ROTATION_VECTOR - 3, // SENSOR_TYPE_RELATIVE_HUMIDITY - 3, // SENSOR_TYPE_AMBIENT_TEMPERATURE + 1, // SENSOR_TYPE_RELATIVE_HUMIDITY + 1, // SENSOR_TYPE_AMBIENT_TEMPERATURE 6, // SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED 4, // SENSOR_TYPE_GAME_ROTATION_VECTOR 6, // SENSOR_TYPE_GYROSCOPE_UNCALIBRATED -- 2.11.0