Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I6349a85d842ef3eccc17120ab2925f96d1b99660
This commit is contained in:
Evan Severson
2020-03-21 06:10:18 +00:00
committed by Automerger Merge Worker
parent 762c8f1508 80e8cf7b2e
commit 543863c083
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/test-current.txt
View File

@@ -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 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_APPLY_RESTRICTION = 16384; // 0x4000
field public static final int FLAG_PERMISSION_GRANTED_BY_ROLE = 32768; // 0x8000 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_POLICY_FIXED = 4; // 0x4
field public static final int FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT = 2048; // 0x800 field public static final int FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT = 2048; // 0x800
field public static final int FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT = 4096; // 0x1000 field public static final int FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT = 4096; // 0x1000

1
core/java/android/content/pm/PackageManager.java
View File

@@ -3399,6 +3399,7 @@ public abstract class PackageManager {
* @hide * @hide
*/ */
@SystemApi @SystemApi
@TestApi
public static final int FLAG_PERMISSION_ONE_TIME = 1 << 16; public static final int FLAG_PERMISSION_ONE_TIME = 1 << 16;
/** /**