commit acbf10ce5c2f4da95ea1b3ca131fb4509f275d98
author Aravind Akella <aakella@google.com> Fri Jun 06 01:57:25 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 06 01:57:25 2014 +0000
tree 0957b1e293b51f6cc26f114f6e0e85a4fdff7f07
parent 6ab4a2c2972d035e81550afdd5514341de9b5155
parent 5271e0b89012b32626913e22bd266137c0b4159f

Merge "Hide Sensor.getRequiredPermission API." into lmp-preview-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 4030539..daf7f84 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -11902,7 +11902,6 @@
     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();

core/java/android/hardware/Sensor.java

diff --git a/core/java/android/hardware/Sensor.java b/core/java/android/hardware/Sensor.java
index 86208fc..c593e9e 100644
--- a/core/java/android/hardware/Sensor.java
+++ b/core/java/android/hardware/Sensor.java
@@ -613,6 +613,7 @@
     }
 
     /**
+     * @hide
      * @return The permission required to access this sensor. If empty, no permission is required.
      */
     public String getRequiredPermission() {