diff options
| author | 2018-09-11 19:27:33 +0000 | |
|---|---|---|
| committer | 2018-09-11 19:27:33 +0000 | |
| commit | d3132319b3403959ad35d2a05a502461a1eb51fb (patch) | |
| tree | 18a716a7ad0cc6ce8a1f26e75aa5b547e7e0c3ad | |
| parent | fe17dcd71685508eb9409423f168849afd9b24c1 (diff) | |
| parent | a4b3022c51dd25bc169dcedeaa9e562cea740bf8 (diff) | |
Merge "Make PackageManager#arePermissionsIndividuallyControlled system-api"
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 7 | ||||
| -rw-r--r-- | test-mock/api/system-current.txt | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 65e34f7c4ff6..1e1c621a561d 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1115,6 +1115,7 @@ package android.content.pm { public abstract class PackageManager { method public abstract void addOnPermissionsChangeListener(android.content.pm.PackageManager.OnPermissionsChangedListener); + method public abstract boolean arePermissionsIndividuallyControlled(); method public abstract java.util.List<android.content.IntentFilter> getAllIntentFilters(java.lang.String); method public android.content.pm.dex.ArtManager getArtManager(); method public abstract java.lang.String getDefaultBrowserPackageNameAsUser(int); diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 5b0e85632b90..1b4878c5e89f 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -3276,11 +3276,14 @@ public abstract class PackageManager { @PermissionInfoFlags int flags) throws NameNotFoundException; /** - * Returns true if some permissions are individually controlled + * Returns true if some permissions are individually controlled. + * + * <p>The user usually grants and revokes permission-groups. If this option is set some + * dangerous system permissions can be revoked/granted by the user separately from their group. * * @hide */ - @TestApi + @TestApi @SystemApi public abstract boolean arePermissionsIndividuallyControlled(); /** diff --git a/test-mock/api/system-current.txt b/test-mock/api/system-current.txt index 20401a50b6a2..3bd3d68ba6cf 100644 --- a/test-mock/api/system-current.txt +++ b/test-mock/api/system-current.txt @@ -11,6 +11,7 @@ package android.test.mock { public deprecated class MockPackageManager extends android.content.pm.PackageManager { method public void addOnPermissionsChangeListener(android.content.pm.PackageManager.OnPermissionsChangedListener); + method public boolean arePermissionsIndividuallyControlled(); method public java.util.List<android.content.IntentFilter> getAllIntentFilters(java.lang.String); method public java.lang.String getDefaultBrowserPackageNameAsUser(int); method public java.util.List<android.content.pm.PackageInfo> getInstalledPackagesAsUser(int, int); |