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

Commit a2858902 authored by Evan Severson's avatar Evan Severson Committed by Android (Google) Code Review
Browse files

Merge "Update reserved permission controller flags name" into rvc-dev

parents f0e7d48f be264b63

api/system-current.txt

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

    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_REBOOT_ESCROW = "android.hardware.reboot_escrow";

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

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

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

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

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

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

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

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

    public static final int FLAG_PERMISSION_AUTO_REVOKED = 1 << 17;





    /**

    /**

     * 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

     * @hide

     */

     */

    @SystemApi

    @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;

            | 1 << 30 | 1 << 31;





    /**

    /**