From 5a8cb8902c2fa3eca1e1fa08fc9ad47564e859e2 Mon Sep 17 00:00:00 2001 From: Kholoud Mohamed Date: Wed, 15 Mar 2023 22:21:51 +0000 Subject: [PATCH] Expose policy key constructors as testAPIs Bug: 273206270 Test: N/A Change-Id: I82e79b608ed078ace4c50d8c61832371d7f05b24 --- core/api/test-current.txt | 20 +++++++++++++++++++ .../app/admin/AccountTypePolicyKey.java | 2 ++ .../app/admin/IntentFilterPolicyKey.java | 2 ++ .../app/admin/PackagePermissionPolicyKey.java | 2 ++ .../android/app/admin/PackagePolicyKey.java | 2 ++ .../app/admin/UserRestrictionPolicyKey.java | 2 ++ 6 files changed, 30 insertions(+) diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 445b957a44f38..6bfaa352f3f77 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -516,6 +516,10 @@ package android.app { package android.app.admin { + public final class AccountTypePolicyKey extends android.app.admin.PolicyKey { + ctor public AccountTypePolicyKey(@NonNull String, @NonNull String); + } + public final class DeviceAdminAuthority extends android.app.admin.Authority { field @NonNull public static final android.app.admin.DeviceAdminAuthority DEVICE_ADMIN_AUTHORITY; } @@ -612,6 +616,10 @@ package android.app.admin { field @NonNull public static final android.app.admin.FlagUnion FLAG_UNION; } + public final class IntentFilterPolicyKey extends android.app.admin.PolicyKey { + ctor public IntentFilterPolicyKey(@NonNull String, @NonNull android.content.IntentFilter); + } + public final class MostRecent extends android.app.admin.ResolutionMechanism { ctor public MostRecent(); method public int describeContents(); @@ -627,6 +635,14 @@ package android.app.admin { field @NonNull public static final android.os.Parcelable.Creator> CREATOR; } + public final class PackagePermissionPolicyKey extends android.app.admin.PolicyKey { + ctor public PackagePermissionPolicyKey(@NonNull String, @NonNull String, @NonNull String); + } + + public final class PackagePolicyKey extends android.app.admin.PolicyKey { + ctor public PackagePolicyKey(@NonNull String, @NonNull String); + } + public final class PolicyState implements android.os.Parcelable { method @NonNull public android.app.admin.ResolutionMechanism getResolutionMechanism(); } @@ -676,6 +692,10 @@ package android.app.admin { method public int getOperation(); } + public final class UserRestrictionPolicyKey extends android.app.admin.PolicyKey { + ctor public UserRestrictionPolicyKey(@NonNull String, @NonNull String); + } + } package android.app.assist { diff --git a/core/java/android/app/admin/AccountTypePolicyKey.java b/core/java/android/app/admin/AccountTypePolicyKey.java index 6417cd47b504e..9e376a7e2bee2 100644 --- a/core/java/android/app/admin/AccountTypePolicyKey.java +++ b/core/java/android/app/admin/AccountTypePolicyKey.java @@ -23,6 +23,7 @@ import static android.app.admin.PolicyUpdateReceiver.EXTRA_POLICY_KEY; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; +import android.annotation.TestApi; import android.os.Bundle; import android.os.Parcel; @@ -49,6 +50,7 @@ public final class AccountTypePolicyKey extends PolicyKey { /** * @hide */ + @TestApi public AccountTypePolicyKey(@NonNull String key, @NonNull String accountType) { super(key); mAccountType = Objects.requireNonNull((accountType)); diff --git a/core/java/android/app/admin/IntentFilterPolicyKey.java b/core/java/android/app/admin/IntentFilterPolicyKey.java index b0af4cd77749a..30aad965c0089 100644 --- a/core/java/android/app/admin/IntentFilterPolicyKey.java +++ b/core/java/android/app/admin/IntentFilterPolicyKey.java @@ -23,6 +23,7 @@ import static android.app.admin.PolicyUpdateReceiver.EXTRA_POLICY_KEY; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; +import android.annotation.TestApi; import android.content.IntentFilter; import android.os.Bundle; import android.os.Parcel; @@ -49,6 +50,7 @@ public final class IntentFilterPolicyKey extends PolicyKey { /** * @hide */ + @TestApi public IntentFilterPolicyKey(@NonNull String identifier, @NonNull IntentFilter filter) { super(identifier); mFilter = Objects.requireNonNull(filter); diff --git a/core/java/android/app/admin/PackagePermissionPolicyKey.java b/core/java/android/app/admin/PackagePermissionPolicyKey.java index 08c4224021f17..7fd514cebd7c4 100644 --- a/core/java/android/app/admin/PackagePermissionPolicyKey.java +++ b/core/java/android/app/admin/PackagePermissionPolicyKey.java @@ -24,6 +24,7 @@ import static android.app.admin.PolicyUpdateReceiver.EXTRA_POLICY_KEY; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; +import android.annotation.TestApi; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -53,6 +54,7 @@ public final class PackagePermissionPolicyKey extends PolicyKey { /** * @hide */ + @TestApi public PackagePermissionPolicyKey(@NonNull String identifier, @NonNull String packageName, @NonNull String permissionName) { super(identifier); diff --git a/core/java/android/app/admin/PackagePolicyKey.java b/core/java/android/app/admin/PackagePolicyKey.java index b2a8d5d24b841..2ab00bc3146c4 100644 --- a/core/java/android/app/admin/PackagePolicyKey.java +++ b/core/java/android/app/admin/PackagePolicyKey.java @@ -23,6 +23,7 @@ import static android.app.admin.PolicyUpdateReceiver.EXTRA_POLICY_KEY; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; +import android.annotation.TestApi; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -50,6 +51,7 @@ public final class PackagePolicyKey extends PolicyKey { /** * @hide */ + @TestApi public PackagePolicyKey(@NonNull String key, @NonNull String packageName) { super(key); mPackageName = Objects.requireNonNull((packageName)); diff --git a/core/java/android/app/admin/UserRestrictionPolicyKey.java b/core/java/android/app/admin/UserRestrictionPolicyKey.java index 880b58b8c321b..aeb2380416054 100644 --- a/core/java/android/app/admin/UserRestrictionPolicyKey.java +++ b/core/java/android/app/admin/UserRestrictionPolicyKey.java @@ -20,6 +20,7 @@ import static android.app.admin.PolicyUpdateReceiver.EXTRA_POLICY_KEY; import android.annotation.NonNull; import android.annotation.SystemApi; +import android.annotation.TestApi; import android.os.Bundle; import android.os.Parcel; @@ -40,6 +41,7 @@ public final class UserRestrictionPolicyKey extends PolicyKey { /** * @hide */ + @TestApi public UserRestrictionPolicyKey(@NonNull String identifier, @NonNull String restriction) { super(identifier); mRestriction = Objects.requireNonNull(restriction);