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

Commit a85f33ee authored by Elis Elliott's avatar Elis Elliott Committed by Automerger Merge Worker
Browse files

Merge "Expose isRemovingAdmin in DevicePolicyManager as a TestApi." into tm-dev am: 0563d4fb 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17003109

Change-Id: Ic78a6b7764ea2f7dd07f1ac5190763bf9f9c456a
parents 69bfcfca 0563d4fb

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -516,6 +516,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);

core/java/android/app/admin/DevicePolicyManager.java

+1 −0
Original line number Diff line number Diff line
@@ -3766,6 +3766,7 @@ public class DevicePolicyManager { 
     * for the user.

     * @hide

     */

    @TestApi

    public boolean isRemovingAdmin(@NonNull ComponentName admin, int userId) {

        if (mService != null) {

            try {