Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3132319 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "Make PackageManager#arePermissionsIndividuallyControlled system-api"

parents fe17dcd7 a4b3022c

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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);

core/java/android/content/pm/PackageManager.java

+5 −2
Original line number Diff line number Diff line
@@ -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();



    /**

test-mock/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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);