diff --git a/core/api/test-current.txt b/core/api/test-current.txt index b752c4de22c73..0ed46d487fd7e 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -514,6 +514,7 @@ package android.app.admin { method public boolean isCurrentInputMethodSetByOwner(); method public boolean isFactoryResetProtectionPolicySupported(); method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public boolean isNewUserDisclaimerAcknowledged(); + method public boolean isRemovingAdmin(@NonNull android.content.ComponentName, int); method @RequiresPermission(anyOf={android.Manifest.permission.MARK_DEVICE_ORGANIZATION_OWNED, android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS}, conditional=true) public void markProfileOwnerOnOrganizationOwnedDevice(@NonNull android.content.ComponentName); method @NonNull public static String operationSafetyReasonToString(int); method @NonNull public static String operationToString(int); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index b944468f10b10..c670ab5ae9647 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3762,6 +3762,7 @@ public class DevicePolicyManager { * for the user. * @hide */ + @TestApi public boolean isRemovingAdmin(@NonNull ComponentName admin, int userId) { if (mService != null) { try {