summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michal Karpinski <mkarpinski@google.com> 2019-01-15 11:26:30 +0000
committer Michal Karpinski <mkarpinski@google.com> 2019-01-15 11:26:36 +0000
commit517959e4849d63140ebaa71ddc04bae2eaac1408 (patch)
tree83db120cbbdf1c3dd3222907d1fb534cc1e3ccf2
parent9114be68cd85d820646d67032dc3f0d27879cb88 (diff)
Make PermissionInfo.PROTECTION_FLAG_OEM @TestApi
So it can be used in CTS. Bug: 110956953 Test: atest PermissionPolicyTest#testPlatformPermissionPolicyUnaltered Change-Id: I1682376845dfa390f01b0e869444c307e6c3d3be
-rw-r--r--api/test-current.txt1
-rw-r--r--core/java/android/content/pm/PermissionInfo.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt
index 55705b6589d7..244823d76a44 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -421,6 +421,7 @@ package android.content.pm {
public class PermissionInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {
field public static final int PROTECTION_FLAG_DOCUMENTER = 262144; // 0x40000
+ field public static final int PROTECTION_FLAG_OEM = 16384; // 0x4000
field public static final int PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER = 65536; // 0x10000
field public static final int PROTECTION_FLAG_VENDOR_PRIVILEGED = 32768; // 0x8000
field public static final int PROTECTION_FLAG_WELLBEING = 131072; // 0x20000
diff --git a/core/java/android/content/pm/PermissionInfo.java b/core/java/android/content/pm/PermissionInfo.java
index bb8c92dba71a..a3395ac9fd13 100644
--- a/core/java/android/content/pm/PermissionInfo.java
+++ b/core/java/android/content/pm/PermissionInfo.java
@@ -158,6 +158,7 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
* @hide
*/
@SystemApi
+ @TestApi
public static final int PROTECTION_FLAG_OEM = 0x4000;
/**