summaryrefslogtreecommitdiffstats
path: root/api/system-current.txt
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2015-04-29 21:15:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-29 21:15:25 +0000
commite35380839e582a98477ba9181460ebfee1c74a9f (patch)
tree209c73a1f3361f7648cb89f2b8a46c4678d0d019 /api/system-current.txt
parente1d003958de51c135ef92ae49ebdaa0f07d959dc (diff)
parentfbf01f77969c1b46d1ffb517a142381c9a914eb8 (diff)
downloadframeworks_base-e35380839e582a98477ba9181460ebfee1c74a9f.zip
frameworks_base-e35380839e582a98477ba9181460ebfee1c74a9f.tar.gz
frameworks_base-e35380839e582a98477ba9181460ebfee1c74a9f.tar.bz2
Merge "Add API to get app op for a permission" into mnc-dev
Diffstat (limited to 'api/system-current.txt')
-rw-r--r--api/system-current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index d931493..0b887d5 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -3949,6 +3949,7 @@ package android.app {
method public void finishOp(java.lang.String, int, java.lang.String);
method public int noteOp(java.lang.String, int, java.lang.String);
method public int noteOpNoThrow(java.lang.String, int, java.lang.String);
+ method public static java.lang.String permissionToOp(java.lang.String);
method public int startOp(java.lang.String, int, java.lang.String);
method public int startOpNoThrow(java.lang.String, int, java.lang.String);
method public void startWatchingMode(java.lang.String, java.lang.String, android.app.AppOpsManager.OnOpChangedListener);