commit a9002d56be7743b78ee76058bc9330e141bd2719
author Michal Karpinski <mkarpinski@google.com> Tue Jan 15 14:36:41 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 15 14:36:41 2019 +0000
tree df2067287c16182b5cf0a760ebbb5389f88aa162
parent 709373210000e08c11d2f8b246566c0a197c5607
parent 517959e4849d63140ebaa71ddc04bae2eaac1408

Merge "Make PermissionInfo.PROTECTION_FLAG_OEM @TestApi"

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index b01cd1b..1ef3096 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -421,6 +421,7 @@
 
   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

core/java/android/content/pm/PermissionInfo.java

diff --git a/core/java/android/content/pm/PermissionInfo.java b/core/java/android/content/pm/PermissionInfo.java
index bb8c92d..a3395ac 100644
--- a/core/java/android/content/pm/PermissionInfo.java
+++ b/core/java/android/content/pm/PermissionInfo.java
@@ -158,6 +158,7 @@
      * @hide
      */
     @SystemApi
+    @TestApi
     public static final int PROTECTION_FLAG_OEM = 0x4000;
 
     /**