diff options
| author | 2020-01-16 15:02:48 -0500 | |
|---|---|---|
| committer | 2020-01-22 14:41:09 -0500 | |
| commit | fdb1fc8fcb8c9cc780f35f7af720ccb267afef1f (patch) | |
| tree | d73820060ccdb8409cfbab778ddaebc20768aa92 | |
| parent | 31ba2a9632596b7e1de701722e76e24908b2bc0a (diff) | |
Add hinge angle sensor type to sensor NDK
Bug: 144139857
Test: N/A
Change-Id: Id809a8f65b31143759978702d18e6ac944d62ac3
| -rw-r--r-- | include/android/sensor.h | 4 | ||||
| -rw-r--r-- | libs/sensor/Sensor.cpp | 4 | ||||
| -rw-r--r-- | libs/sensor/SensorManager.cpp | 2 | ||||
| -rw-r--r-- | services/sensorservice/SensorServiceUtils.cpp | 1 |
4 files changed, 10 insertions, 1 deletions
diff --git a/include/android/sensor.h b/include/android/sensor.h index 3ebe79fd2e..12c00ad8a2 100644 --- a/include/android/sensor.h +++ b/include/android/sensor.h @@ -245,6 +245,10 @@ enum { * {@link ASENSOR_TYPE_ACCELEROMETER_UNCALIBRATED} */ ASENSOR_TYPE_ACCELEROMETER_UNCALIBRATED = 35, + /** + * {@link ASENSOR_TYPE_HINGE_ANGLE} + */ + ASENSOR_TYPE_HINGE_ANGLE = 36, }; /** diff --git a/libs/sensor/Sensor.cpp b/libs/sensor/Sensor.cpp index abc910302c..9d817ae0bd 100644 --- a/libs/sensor/Sensor.cpp +++ b/libs/sensor/Sensor.cpp @@ -268,6 +268,10 @@ Sensor::Sensor(struct sensor_t const& hwSensor, const uuid_t& uuid, int halVersi mStringType = SENSOR_STRING_TYPE_ACCELEROMETER_UNCALIBRATED; mFlags |= SENSOR_FLAG_CONTINUOUS_MODE; break; + case SENSOR_TYPE_HINGE_ANGLE: + mStringType = SENSOR_STRING_TYPE_HINGE_ANGLE; + mFlags |= SENSOR_FLAG_ON_CHANGE_MODE; + break; default: // Only pipe the stringType, requiredPermission and flags for custom sensors. if (halVersion > SENSORS_DEVICE_API_VERSION_1_0 && hwSensor.stringType) { diff --git a/libs/sensor/SensorManager.cpp b/libs/sensor/SensorManager.cpp index bf8b9f73fe..a4a5d135c0 100644 --- a/libs/sensor/SensorManager.cpp +++ b/libs/sensor/SensorManager.cpp @@ -209,7 +209,7 @@ Sensor const* SensorManager::getDefaultSensor(int type) type == SENSOR_TYPE_TILT_DETECTOR || type == SENSOR_TYPE_WAKE_GESTURE || type == SENSOR_TYPE_GLANCE_GESTURE || type == SENSOR_TYPE_PICK_UP_GESTURE || type == SENSOR_TYPE_WRIST_TILT_GESTURE || - type == SENSOR_TYPE_LOW_LATENCY_OFFBODY_DETECT) { + type == SENSOR_TYPE_LOW_LATENCY_OFFBODY_DETECT || type == SENSOR_TYPE_HINGE_ANGLE) { wakeUpSensor = true; } // For now we just return the first sensor of that type we find. diff --git a/services/sensorservice/SensorServiceUtils.cpp b/services/sensorservice/SensorServiceUtils.cpp index 34cd8ddd7b..fdd56b364d 100644 --- a/services/sensorservice/SensorServiceUtils.cpp +++ b/services/sensorservice/SensorServiceUtils.cpp @@ -55,6 +55,7 @@ size_t eventSizeBySensorType(int type) { case SENSOR_TYPE_MOTION_DETECT: case SENSOR_TYPE_HEART_BEAT: case SENSOR_TYPE_LOW_LATENCY_OFFBODY_DETECT: + case SENSOR_TYPE_HINGE_ANGLE: return 1; default: |