Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f8a10d77: Merge "Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE" into klp-modular-dev

Browse Source 
* commit 'f8a10d775efcc1c7255c1e504bf59f7cd38967ef':
  Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE
This commit is contained in:
Justin Koh
2014-05-05 22:42:19 +00:00
committed by Android Git Automerger
parent 5aa34455d7 f8a10d775e
commit 8e4cbcce66
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -10758,7 +10758,6 @@ package android.hardware {
method public int getMinDelay(); method public int getMinDelay();
method public java.lang.String getName(); method public java.lang.String getName();
method public float getPower(); method public float getPower();
method public java.lang.String getRequiredPermission();
method public float getResolution(); method public float getResolution();
method public java.lang.String getStringType(); method public java.lang.String getStringType();
method public int getType(); method public int getType();

1
core/java/android/hardware/Sensor.java
View File

@@ -588,6 +588,7 @@ public final class Sensor {
/** /**
* @return The permission required to access this sensor. If empty, no permission is required. * @return The permission required to access this sensor. If empty, no permission is required.
* @hide
*/ */
public String getRequiredPermission() { public String getRequiredPermission() {
return mRequiredPermission; return mRequiredPermission;