From a105c7b1a81b468aca34dd37a3ba01ad11966608 Mon Sep 17 00:00:00 2001 From: Ashutosh Joshi Date: Sat, 15 Apr 2017 05:50:40 -0700 Subject: [PATCH] Ensure that LLOB sensor is names similr to other android sensors. Ensuring that the LLOB sensos naming style is consistent with other sensor naming styles. Bug: 36554362 Test: Verify that the sensor shows up with the appropriate name string. Change-Id: I904bd067e8a427ef32a45f19c6bff29afb69bec3 --- api/current.txt | 2 +- api/system-current.txt | 2 +- api/test-current.txt | 2 +- core/java/android/hardware/Sensor.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/current.txt b/api/current.txt index 23dab486e0502..9b6d0e40b762c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -14815,7 +14815,7 @@ package android.hardware { field public static final java.lang.String STRING_TYPE_HEART_RATE = "android.sensor.heart_rate"; field public static final java.lang.String STRING_TYPE_LIGHT = "android.sensor.light"; field public static final java.lang.String STRING_TYPE_LINEAR_ACCELERATION = "android.sensor.linear_acceleration"; - field public static final java.lang.String STRING_TYPE_LOW_LATENCY_OFFBODY_DETECT = "android.sensor.low_latency_offbody"; + field public static final java.lang.String STRING_TYPE_LOW_LATENCY_OFFBODY_DETECT = "android.sensor.low_latency_offbody_detect"; field public static final java.lang.String STRING_TYPE_MAGNETIC_FIELD = "android.sensor.magnetic_field"; field public static final java.lang.String STRING_TYPE_MAGNETIC_FIELD_UNCALIBRATED = "android.sensor.magnetic_field_uncalibrated"; field public static final java.lang.String STRING_TYPE_MOTION_DETECT = "android.sensor.motion_detect"; diff --git a/api/system-current.txt b/api/system-current.txt index f39afe176c6fc..ec6450e766b65 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -15592,7 +15592,7 @@ package android.hardware { field public static final java.lang.String STRING_TYPE_HEART_RATE = "android.sensor.heart_rate"; field public static final java.lang.String STRING_TYPE_LIGHT = "android.sensor.light"; field public static final java.lang.String STRING_TYPE_LINEAR_ACCELERATION = "android.sensor.linear_acceleration"; - field public static final java.lang.String STRING_TYPE_LOW_LATENCY_OFFBODY_DETECT = "android.sensor.low_latency_offbody"; + field public static final java.lang.String STRING_TYPE_LOW_LATENCY_OFFBODY_DETECT = "android.sensor.low_latency_offbody_detect"; field public static final java.lang.String STRING_TYPE_MAGNETIC_FIELD = "android.sensor.magnetic_field"; field public static final java.lang.String STRING_TYPE_MAGNETIC_FIELD_UNCALIBRATED = "android.sensor.magnetic_field_uncalibrated"; field public static final java.lang.String STRING_TYPE_MOTION_DETECT = "android.sensor.motion_detect"; diff --git a/api/test-current.txt b/api/test-current.txt index bd29d72bb1218..7d12318b35f1a 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -14860,7 +14860,7 @@ package android.hardware { field public static final java.lang.String STRING_TYPE_HEART_RATE = "android.sensor.heart_rate"; field public static final java.lang.String STRING_TYPE_LIGHT = "android.sensor.light"; field public static final java.lang.String STRING_TYPE_LINEAR_ACCELERATION = "android.sensor.linear_acceleration"; - field public static final java.lang.String STRING_TYPE_LOW_LATENCY_OFFBODY_DETECT = "android.sensor.low_latency_offbody"; + field public static final java.lang.String STRING_TYPE_LOW_LATENCY_OFFBODY_DETECT = "android.sensor.low_latency_offbody_detect"; field public static final java.lang.String STRING_TYPE_MAGNETIC_FIELD = "android.sensor.magnetic_field"; field public static final java.lang.String STRING_TYPE_MAGNETIC_FIELD_UNCALIBRATED = "android.sensor.magnetic_field_uncalibrated"; field public static final java.lang.String STRING_TYPE_MOTION_DETECT = "android.sensor.motion_detect"; diff --git a/core/java/android/hardware/Sensor.java b/core/java/android/hardware/Sensor.java index a895f820789c7..f02e4849e7dab 100644 --- a/core/java/android/hardware/Sensor.java +++ b/core/java/android/hardware/Sensor.java @@ -664,7 +664,7 @@ public final class Sensor { * @see #TYPE_LOW_LATENCY_OFFBODY_DETECT */ public static final String STRING_TYPE_LOW_LATENCY_OFFBODY_DETECT = - "android.sensor.low_latency_offbody"; + "android.sensor.low_latency_offbody_detect"; /** * A constant describing an uncalibrated accelerometer sensor.