summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJustin Koh <justinkoh@google.com>2014-05-05 22:42:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-05 22:42:19 +0000
commit8e4cbcce6616aee96754393aaddb23df91bfc02c (patch)
treed78e25eb6a3392da01f71a1f80279f3e05836c6a /core/java/android
parent5aa34455d7d921f33b67463cd58b879d5cfcf1ca (diff)
parentf8a10d775efcc1c7255c1e504bf59f7cd38967ef (diff)
am f8a10d77: Merge "Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE" into klp-modular-dev
* commit 'f8a10d775efcc1c7255c1e504bf59f7cd38967ef': Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/hardware/Sensor.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/hardware/Sensor.java b/core/java/android/hardware/Sensor.java
index 4bea9eeac225..ad5a753342a8 100644
--- a/core/java/android/hardware/Sensor.java
+++ b/core/java/android/hardware/Sensor.java
@@ -588,6 +588,7 @@ public final class Sensor {
/**
* @return The permission required to access this sensor. If empty, no permission is required.
+ * @hide
*/
public String getRequiredPermission() {
return mRequiredPermission;