From ede38006f9ab4e8e9d41e6ff9452ecb560c81275 Mon Sep 17 00:00:00 2001 From: Hai Zhang Date: Mon, 14 Nov 2022 22:47:42 +0000 Subject: [PATCH] Expose PermissionInfo.PROTECTION_FLAG_VENDOR_PRIVILEGED as system API. It's already a test API and will be needed in Mainline. All other protection flags are already APIs except this one. Bug: 182523293 Test: atest PermissionPolicyTest Change-Id: I3e6573755b9cb7b2c91071a623295301327f419e --- core/api/system-current.txt | 1 + core/api/test-current.txt | 4 ---- core/java/android/content/pm/PermissionInfo.java | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 595e38aa55767..6c2abf82c35de 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -3615,6 +3615,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 knownCerts; diff --git a/core/api/test-current.txt b/core/api/test-current.txt index f0763950ba378..db839937d59ab 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -862,10 +862,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); diff --git a/core/java/android/content/pm/PermissionInfo.java b/core/java/android/content/pm/PermissionInfo.java index 7c22c08860b19..61fc6f6775c12 100644 --- a/core/java/android/content/pm/PermissionInfo.java +++ b/core/java/android/content/pm/PermissionInfo.java @@ -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; /**