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

Commit d035506d authored by Jay Sullivan's avatar Jay Sullivan Committed by Automerger Merge Worker
Browse files

Merge "Make REVOKE_WHEN_REQUESTED a SystemApi field" into sc-dev am: a26bf499 am: 47490c75 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14297593

Change-Id: If72de11e33c4ec96f265ac754912c6348406059e
parents e27525ed 47490c75

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2757,6 +2757,7 @@ package android.content.pm { 
    field public static final int FLAG_PERMISSION_REVIEW_REQUIRED = 64; // 0x40

    field public static final int FLAG_PERMISSION_REVOKED_COMPAT = 8; // 0x8

    field @Deprecated public static final int FLAG_PERMISSION_REVOKE_ON_UPGRADE = 8; // 0x8

    field public static final int FLAG_PERMISSION_REVOKE_WHEN_REQUESTED = 128; // 0x80

    field public static final int FLAG_PERMISSION_SELECTED_LOCATION_ACCURACY = 524288; // 0x80000

    field public static final int FLAG_PERMISSION_SYSTEM_FIXED = 16; // 0x10

    field public static final int FLAG_PERMISSION_USER_FIXED = 2; // 0x2

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

+1 −0
Original line number Diff line number Diff line
@@ -3969,6 +3969,7 @@ public abstract class PackageManager { 
     * @hide

     */

    @TestApi

    @SystemApi

    public static final int FLAG_PERMISSION_REVOKE_WHEN_REQUESTED =  1 << 7;



    /**