diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2015-07-10 00:32:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-10 00:32:12 +0000 |
| commit | 171fe6ac0aa5b0d2dd64ac1cdda25cdcb5f183f3 (patch) | |
| tree | 281e5fe4812eb30a91a1f5c6b1f754aaa66548fe /api | |
| parent | 4ee9b23a6f1856bfe7fa810b585b4ced02745d65 (diff) | |
| parent | ad3b2975574f916c14382628d50c710a78064746 (diff) | |
| download | frameworks_base-171fe6ac0aa5b0d2dd64ac1cdda25cdcb5f183f3.zip frameworks_base-171fe6ac0aa5b0d2dd64ac1cdda25cdcb5f183f3.tar.gz frameworks_base-171fe6ac0aa5b0d2dd64ac1cdda25cdcb5f183f3.tar.bz2 | |
Merge "Add an API for apps to query if a permisison is denied by policy." into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 0eeb68a..fe67aad 100644 --- a/api/current.txt +++ b/api/current.txt @@ -9256,6 +9256,7 @@ package android.content.pm { method public abstract java.lang.CharSequence getUserBadgedLabel(java.lang.CharSequence, android.os.UserHandle); method public abstract android.content.res.XmlResourceParser getXml(java.lang.String, int, android.content.pm.ApplicationInfo); method public abstract boolean hasSystemFeature(java.lang.String); + method public abstract boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String); method public abstract boolean isSafeMode(); method public abstract java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int); method public abstract java.util.List<android.content.pm.ProviderInfo> queryContentProviders(java.lang.String, int, int); @@ -31806,6 +31807,7 @@ package android.test.mock { method public java.lang.CharSequence getUserBadgedLabel(java.lang.CharSequence, android.os.UserHandle); method public android.content.res.XmlResourceParser getXml(java.lang.String, int, android.content.pm.ApplicationInfo); method public boolean hasSystemFeature(java.lang.String); + method public boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String); method public boolean isSafeMode(); method public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int); method public java.util.List<android.content.pm.ProviderInfo> queryContentProviders(java.lang.String, int, int); diff --git a/api/system-current.txt b/api/system-current.txt index ef03bad..3570d42 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9540,6 +9540,7 @@ package android.content.pm { method public abstract android.content.res.XmlResourceParser getXml(java.lang.String, int, android.content.pm.ApplicationInfo); method public abstract void grantRuntimePermission(java.lang.String, java.lang.String, android.os.UserHandle); method public abstract boolean hasSystemFeature(java.lang.String); + method public abstract boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String); method public abstract boolean isSafeMode(); method public abstract java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int); method public abstract java.util.List<android.content.pm.ProviderInfo> queryContentProviders(java.lang.String, int, int); @@ -34092,6 +34093,7 @@ package android.test.mock { method public android.content.res.XmlResourceParser getXml(java.lang.String, int, android.content.pm.ApplicationInfo); method public void grantRuntimePermission(java.lang.String, java.lang.String, android.os.UserHandle); method public boolean hasSystemFeature(java.lang.String); + method public boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String); method public boolean isSafeMode(); method public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int); method public java.util.List<android.content.pm.ProviderInfo> queryContentProviders(java.lang.String, int, int); |