Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf2e5bd0 authored by Ashutosh Joshi's avatar Ashutosh Joshi Committed by Android (Google) Code Review
Browse files

Merge "Ensure that LLOB sensor is names similr to other android sensors." into oc-dev

parents 2891f34e a105c7b1

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -14818,7 +14818,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";

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -15595,7 +15595,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";

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -14863,7 +14863,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";

core/java/android/hardware/Sensor.java

+1 −1
Original line number Diff line number Diff line
@@ -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.