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

Commit 80e8cf7b authored by Evan Severson's avatar Evan Severson Committed by Automerger Merge Worker
Browse files

Merge "Add one-time flag to test api" into rvc-dev am: 4846c5e3 

Change-Id: Ifc303a6173eed86aa2bb18758de81cc733dc7f46
parents fc7b0a28 4846c5e3

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -974,6 +974,7 @@ package android.content.pm { 
    field public static final String FEATURE_FILE_BASED_ENCRYPTION = "android.software.file_based_encryption";

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

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

    field public static final int FLAG_PERMISSION_ONE_TIME = 65536; // 0x10000

    field public static final int FLAG_PERMISSION_POLICY_FIXED = 4; // 0x4

    field public static final int FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT = 2048; // 0x800

    field public static final int FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT = 4096; // 0x1000

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

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

     */

    @SystemApi

    @TestApi

    public static final int FLAG_PERMISSION_ONE_TIME = 1 << 16;



    /**