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

Commit a9002d56 authored by Michal Karpinski's avatar Michal Karpinski Committed by Android (Google) Code Review
Browse files

Merge "Make PermissionInfo.PROTECTION_FLAG_OEM @TestApi"

parents 70937321 517959e4

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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

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

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { 
     * @hide

     */

    @SystemApi

    @TestApi

    public static final int PROTECTION_FLAG_OEM = 0x4000;



    /**