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

Commit 75b5b13c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add reserved permission flag values for the permission controller"

parents b20cfac0 e80ecd55

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2263,6 +2263,7 @@ package android.content.pm { 
    field public static final String FEATURE_BROADCAST_RADIO = "android.hardware.broadcastradio";

    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 FLAG_PERMISSION_APPLY_RESTRICTION = 16384; // 0x4000

    field public static final int FLAG_PERMISSION_GRANTED_BY_DEFAULT = 32; // 0x20

    field public static final int FLAG_PERMISSION_GRANTED_BY_ROLE = 32768; // 0x8000

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

+9 −0
Original line number Diff line number Diff line
@@ -3327,6 +3327,15 @@ public abstract class PackageManager { 
    @SystemApi

    public static final int FLAG_PERMISSION_ONE_TIME = 1 << 16;



    /**

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

     *

     * @hide

     */

    @SystemApi

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

            | 1 << 30 | 1 << 31;



    /**

     * Permission flags: Bitwise or of all permission flags allowing an

     * exemption for a restricted permission.