summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Brian Duddie <bduddie@google.com> 2019-08-14 13:23:37 -0700
committer android-build-merger <android-build-merger@google.com> 2019-08-14 13:23:37 -0700
commit6b15b773a3f4df46dfff32e07f60c5909494ee4f (patch)
tree1274379de7ff2d4666f0773b9f0b6e097775c14b
parentf0c2d88a241f9c7cb408fac703f9cda087e4c346 (diff)
parent7eeb6f60f9eb819d6a3181920e1248987c596211 (diff)
Merge "docs: Correct sensor runtime permission documentation" into qt-dev am: 119f1220cd
am: 7eeb6f60f9 Change-Id: Ic6e8d2b490b79b9c62cd374a28fb04504fb34bcc
-rw-r--r--core/java/android/hardware/Sensor.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/hardware/Sensor.java b/core/java/android/hardware/Sensor.java
index 099ae291c8f4..e78fb7f00797 100644
--- a/core/java/android/hardware/Sensor.java
+++ b/core/java/android/hardware/Sensor.java
@@ -339,6 +339,8 @@ public final class Sensor {
* for {@link #TYPE_STEP_COUNTER} instead. It is defined as a
* {@link Sensor#REPORTING_MODE_SPECIAL_TRIGGER} sensor.
* <p>
+ * This sensor requires permission {@code android.permission.ACTIVITY_RECOGNITION}.
+ * <p>
* See {@link android.hardware.SensorEvent#values SensorEvent.values} for more details.
*/
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
* use the gyroscope. However, it is more noisy and will work best outdoors.
* <p>
- * This sensor requires permission {@code android.permission.ACTIVITY_RECOGNITION}.
- * <p>
* See {@link android.hardware.SensorEvent#values SensorEvent.values} for more details.
*/
public static final int TYPE_GEOMAGNETIC_ROTATION_VECTOR = 20;