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

Merge "Update reserved permission controller flags name" into rvc-dev am: a285890237 am: 94e881fd42 am: be859913ad

Browse Source 
Change-Id: Ia0628326fe6815e03b87e446eb42309b279a1ab4
This commit is contained in:
Automerger Merge Worker
2020-03-13 19:20:51 +00:00
parent 97d2ddc3a3 be859913ad
commit 1128aad712
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -2215,7 +2215,7 @@ package android.content.pm {
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_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_AUTO_REVOKED = 131072; // 0x20000
field public static final int FLAG_PERMISSION_GRANTED_BY_DEFAULT = 32; // 0x20

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

@@ -3411,12 +3411,13 @@ public abstract class PackageManager {
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
*/
@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;
/**