Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose isRemovingAdmin in DevicePolicyManager as a TestApi." into tm-dev

Browse Source
This commit is contained in:
Elis Elliott
2022-03-02 15:38:36 +00:00
committed by Android (Google) Code Review
parent 7081ab5bff b6d3083b06
commit 0563d4fb32
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/test-current.txt
View File

@@ -516,6 +516,7 @@ package android.app.admin {
method public boolean isCurrentInputMethodSetByOwner(); method public boolean isCurrentInputMethodSetByOwner();
method public boolean isFactoryResetProtectionPolicySupported(); method public boolean isFactoryResetProtectionPolicySupported();
method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public boolean isNewUserDisclaimerAcknowledged(); 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 @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 operationSafetyReasonToString(int);
method @NonNull public static String operationToString(int); method @NonNull public static String operationToString(int);

1
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -3766,6 +3766,7 @@ public class DevicePolicyManager {
* for the user. * for the user.
* @hide * @hide
*/ */
@TestApi
public boolean isRemovingAdmin(@NonNull ComponentName admin, int userId) { public boolean isRemovingAdmin(@NonNull ComponentName admin, int userId) {
if (mService != null) { if (mService != null) {
try { try {