diff options
| author | Justin Koh <justinkoh@google.com> | 2014-05-05 22:38:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-05 22:38:17 +0000 |
| commit | f8a10d775efcc1c7255c1e504bf59f7cd38967ef (patch) | |
| tree | e3ecb1449c63e0eeb99b5015b869546239ccb660 | |
| parent | 9cb3b162ebf2c85b2b34d399623ff68427b2cdca (diff) | |
| parent | 618f30db3e59c7dda7bb22b0a400ecb0f6b2d0bc (diff) | |
| download | frameworks_base-f8a10d775efcc1c7255c1e504bf59f7cd38967ef.zip frameworks_base-f8a10d775efcc1c7255c1e504bf59f7cd38967ef.tar.gz frameworks_base-f8a10d775efcc1c7255c1e504bf59f7cd38967ef.tar.bz2 | |
Merge "Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE" into klp-modular-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/hardware/Sensor.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index a495e36..4712112 100644 --- a/api/current.txt +++ b/api/current.txt @@ -10758,7 +10758,6 @@ package android.hardware { method public int getMinDelay(); method public java.lang.String getName(); method public float getPower(); - method public java.lang.String getRequiredPermission(); method public float getResolution(); method public java.lang.String getStringType(); method public int getType(); diff --git a/core/java/android/hardware/Sensor.java b/core/java/android/hardware/Sensor.java index 4bea9ee..ad5a753 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; |