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

Commit be264b63 authored by Evan Severson's avatar Evan Severson
Browse files

Update reserved permission controller flags name 

Feedback from the api council advised on changing the name of reserved
permission controller flag mask constant and also update the
documentation to be more descriptive.

Fixes: 149216099
Test: Presubmit
Change-Id: I15db4204ef9c3468676d93331b760b39a3488c81
parent 9c8f402a

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -2221,7 +2221,7 @@ package android.content.pm { 
    field public static final String FEATURE_INCREMENTAL_DELIVERY = "android.software.incremental_delivery";

    field public static final String FEATURE_REBOOT_ESCROW = "android.hardware.reboot_escrow";

    field public static final String FEATURE_TELEPHONY_CARRIERLOCK = "android.hardware.telephony.carrierlock";

    field public static final int FLAGS_PERMISSION_RESERVED_PERMISSIONCONTROLLER = -268435456; // 0xf0000000

    field public static final int FLAGS_PERMISSION_RESERVED_PERMISSION_CONTROLLER = -268435456; // 0xf0000000

    field public static final int FLAG_PERMISSION_APPLY_RESTRICTION = 16384; // 0x4000

    field public static final int FLAG_PERMISSION_AUTO_REVOKED = 1048576; // 0x100000

    field public static final int FLAG_PERMISSION_AUTO_REVOKE_IF_UNUSED = 131072; // 0x20000

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

+4 −3
Original line number Diff line number Diff line
@@ -3422,12 +3422,13 @@ public abstract class PackageManager { 
    public static final int FLAG_PERMISSION_AUTO_REVOKED = 1 << 20;



    /**

     * Permission flags: Reserved for use by the permission controller.

     *

     * Permission flags: Reserved for use by the permission controller. The platform and any

     * packages besides the permission controller should not assume any definition about these

     * flags.

     * @hide

     */

    @SystemApi

    public static final int FLAGS_PERMISSION_RESERVED_PERMISSIONCONTROLLER = 1 << 28 | 1 << 29

    public static final int FLAGS_PERMISSION_RESERVED_PERMISSION_CONTROLLER = 1 << 28 | 1 << 29

            | 1 << 30 | 1 << 31;



    /**