From b6d3083b06ad80d422b88ba60dc160703e503107 Mon Sep 17 00:00:00 2001
From: Elis Elliott <eliselliott@google.com>
Date: Fri, 25 Feb 2022 10:03:07 +0000
Subject: [PATCH] Expose isRemovingAdmin in DevicePolicyManager as a TestApi.

Fixes: 219894175

Test: android.devicepolicy.cts.DevicePolicyManagerTest#setAndRemoveDeviceOwnerRepeatedly_doesNotThrowError
Test: android.devicepolicy.cts.DevicePolicyManagerTest#setAndRemoveProfileOwnerRepeatedly_doesNotThrowError
Change-Id: Ifd9fc00878ce8243c0f34eca827b5a857ffc1b2f
---
 core/api/test-current.txt                            | 1 +
 core/java/android/app/admin/DevicePolicyManager.java | 1 +
 2 files changed, 2 insertions(+)

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 {