summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2015-07-16 22:21:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-16 22:22:01 +0000
commitd4b566bf56333de708908ce4accb5fb067be64f0 (patch)
treef24faa63e34e3c72751f223dd8d52296618e20e1 /api
parent0f724601d78d8f36a297333227d9c460e10b3203 (diff)
parent7121e18595d4c559044e26bfe6035406a862f466 (diff)
downloadframeworks_base-d4b566bf56333de708908ce4accb5fb067be64f0.zip
frameworks_base-d4b566bf56333de708908ce4accb5fb067be64f0.tar.gz
frameworks_base-d4b566bf56333de708908ce4accb5fb067be64f0.tar.bz2
Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev
Diffstat (limited to 'api')
-rw-r--r--api/system-current.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index cbb1bb2..d1e19fb 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -104,6 +104,7 @@ package android {
field public static final java.lang.String HARDWARE_TEST = "android.permission.HARDWARE_TEST";
field public static final java.lang.String HDMI_CEC = "android.permission.HDMI_CEC";
field public static final java.lang.String INJECT_EVENTS = "android.permission.INJECT_EVENTS";
+ field public static final java.lang.String INSTALL_GRANT_RUNTIME_PERMISSIONS = "android.permission.INSTALL_GRANT_RUNTIME_PERMISSIONS";
field public static final java.lang.String INSTALL_LOCATION_PROVIDER = "android.permission.INSTALL_LOCATION_PROVIDER";
field public static final java.lang.String INSTALL_PACKAGES = "android.permission.INSTALL_PACKAGES";
field public static final java.lang.String INSTALL_SHORTCUT = "com.android.launcher.permission.INSTALL_SHORTCUT";
@@ -181,6 +182,7 @@ package android {
field public static final java.lang.String REQUEST_INSTALL_PACKAGES = "android.permission.REQUEST_INSTALL_PACKAGES";
field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES";
field public static final java.lang.String RETRIEVE_WINDOW_CONTENT = "android.permission.RETRIEVE_WINDOW_CONTENT";
+ field public static final java.lang.String REVOKE_RUNTIME_PERMISSIONS = "android.permission.REVOKE_RUNTIME_PERMISSIONS";
field public static final java.lang.String SCORE_NETWORKS = "android.permission.SCORE_NETWORKS";
field public static final java.lang.String SEND_RESPOND_VIA_MESSAGE = "android.permission.SEND_RESPOND_VIA_MESSAGE";
field public static final java.lang.String SEND_SMS = "android.permission.SEND_SMS";
@@ -9436,6 +9438,7 @@ package android.content.pm {
method public void setAppIcon(android.graphics.Bitmap);
method public void setAppLabel(java.lang.CharSequence);
method public void setAppPackageName(java.lang.String);
+ method public void setGrantedRuntimePermissions(java.lang.String[]);
method public void setInstallLocation(int);
method public void setOriginatingUri(android.net.Uri);
method public void setReferrerUri(android.net.Uri);