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

Commit 9ed9b9a5 authored by Hai Zhang's avatar Hai Zhang Committed by Android (Google) Code Review
Browse files

Merge "Expose PermissionInfo.PROTECTION_FLAG_VENDOR_PRIVILEGED as system API."

parents 6d814d97 ede38006

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3629,6 +3629,7 @@ package android.content.pm { 
    field public static final int PROTECTION_FLAG_RETAIL_DEMO = 16777216; // 0x1000000

    field public static final int PROTECTION_FLAG_ROLE = 67108864; // 0x4000000

    field public static final int PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER = 65536; // 0x10000

    field public static final int PROTECTION_FLAG_VENDOR_PRIVILEGED = 32768; // 0x8000

    field @Deprecated public static final int PROTECTION_FLAG_WELLBEING = 131072; // 0x20000

    field @Nullable public final String backgroundPermission;

    field @NonNull public java.util.Set<java.lang.String> knownCerts;

core/api/test-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -859,10 +859,6 @@ package android.content.pm { 
    field public static final String SYSTEM_SHARED_LIBRARY_SHARED = "android.ext.shared";

  }



  public class PermissionInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {

    field public static final int PROTECTION_FLAG_VENDOR_PRIVILEGED = 32768; // 0x8000

  }



  public final class ProviderInfoList implements android.os.Parcelable {

    method public int describeContents();

    method @NonNull public static android.content.pm.ProviderInfoList fromList(@NonNull java.util.List<android.content.pm.ProviderInfo>);

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

+1 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.annotation.Nullable; 
import android.annotation.StringRes;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.os.Build;

import android.os.Parcel;
@@ -184,7 +183,7 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { 
     *

     * @hide

     */

    @TestApi

    @SystemApi

    public static final int PROTECTION_FLAG_VENDOR_PRIVILEGED = 0x8000;



    /**