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

Commit 77223b5c authored by Brian Duddie's avatar Brian Duddie Committed by android-build-merger
Browse files

Merge "docs: Correct sensor runtime permission documentation" into qt-dev am:... 

Merge "docs: Correct sensor runtime permission documentation" into qt-dev am: 119f1220 am: 7eeb6f60
am: e1d3f8e8

Change-Id: I0a824e981f1ecffa7d529f402f17b740f715bae6
parents 39e543f1 e1d3f8e8

core/java/android/hardware/Sensor.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -339,6 +339,8 @@ public final class Sensor { 
     * for {@link #TYPE_STEP_COUNTER} instead. It is defined as a

     * for {@link #TYPE_STEP_COUNTER} instead. It is defined as a

     * {@link Sensor#REPORTING_MODE_SPECIAL_TRIGGER} sensor.

     * {@link Sensor#REPORTING_MODE_SPECIAL_TRIGGER} sensor.

     * <p>

     * <p>

     * This sensor requires permission {@code android.permission.ACTIVITY_RECOGNITION}.

     * <p>

     * See {@link android.hardware.SensorEvent#values SensorEvent.values} for more details.

     * See {@link android.hardware.SensorEvent#values SensorEvent.values} for more details.

     */

     */

    public static final int TYPE_STEP_DETECTOR = 18;

    public static final int TYPE_STEP_DETECTOR = 18;
@@ -384,8 +386,6 @@ public final class Sensor { 
     * gyroscope. This sensor uses lower power than the other rotation vectors, because it doesn't

     * gyroscope. This sensor uses lower power than the other rotation vectors, because it doesn't

     * use the gyroscope. However, it is more noisy and will work best outdoors.

     * use the gyroscope. However, it is more noisy and will work best outdoors.

     * <p>

     * <p>

     * This sensor requires permission {@code android.permission.ACTIVITY_RECOGNITION}.

     * <p>

     * See {@link android.hardware.SensorEvent#values SensorEvent.values} for more details.

     * See {@link android.hardware.SensorEvent#values SensorEvent.values} for more details.

     */

     */

    public static final int TYPE_GEOMAGNETIC_ROTATION_VECTOR = 20;

    public static final int TYPE_GEOMAGNETIC_ROTATION_VECTOR = 20;