summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2015-04-29 21:51:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-29 21:51:56 +0000
commit208b2c3b9a07e682b4a836b709c8388cccb39f8a (patch)
treeefdf4e461998c5d78c73d678ff28ae927b353062 /api
parent4e1716528773deed85564624efb806e4a11fa0a0 (diff)
parent2c372ef0240c5f1444d118b046e66c9f35fec28a (diff)
downloadframeworks_base-208b2c3b9a07e682b4a836b709c8388cccb39f8a.zip
frameworks_base-208b2c3b9a07e682b4a836b709c8388cccb39f8a.tar.gz
frameworks_base-208b2c3b9a07e682b4a836b709c8388cccb39f8a.tar.bz2
am 2c372ef0: am 104a23c5: am e3538083: Merge "Add API to get app op for a permission" into mnc-dev
* commit '2c372ef0240c5f1444d118b046e66c9f35fec28a': Add API to get app op for a permission
Diffstat (limited to 'api')
-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 9193c8e..d113025 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);