From 74d1de594bccc15ad9e6d645b04945abd6bb22f7 Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Tue, 28 Sep 2021 16:33:09 -0700 Subject: [PATCH] Removed unused DevicePolicyManager.setDeviceOwner() methods. Test: atest FrameworksServicesTests:DevicePolicyManagerTest Test: m Fixes: 201463607 Change-Id: Idbd441cc7e352f0c147b521c4153359b3fc6c6d8 --- .../app/admin/DevicePolicyManager.java | 27 ------------------- .../devicepolicy/DevicePolicyManagerTest.java | 13 ++++----- 2 files changed, 7 insertions(+), 33 deletions(-) diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index f572576222da1..4051cc9b79ba6 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -7707,33 +7707,6 @@ public class DevicePolicyManager { } } - /** - * @hide - * Sets the given package as the device owner. - * Same as {@link #setDeviceOwner(ComponentName, String)} but without setting a device owner name. - * @param who the component name to be registered as device owner. - * @return whether the package was successfully registered as the device owner. - * @throws IllegalArgumentException if the package name is null or invalid - * @throws IllegalStateException If the preconditions mentioned are not met. - */ - public boolean setDeviceOwner(ComponentName who) { - return setDeviceOwner(who, null); - } - - /** - * @hide - */ - public boolean setDeviceOwner(ComponentName who, int userId) { - return setDeviceOwner(who, null, userId); - } - - /** - * @hide - */ - public boolean setDeviceOwner(ComponentName who, String ownerName) { - return setDeviceOwner(who, ownerName, UserHandle.USER_SYSTEM); - } - /** * @hide * Sets the given package as the device owner. The package must already be installed. There diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java index 140a8ebe4de9a..ff92197877493 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java @@ -1080,7 +1080,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { dpm.setActiveAdmin(admin1, /* replace =*/ false); // Fire! - assertThat(dpm.setDeviceOwner(admin1, "owner-name")).isTrue(); + assertThat(dpm.setDeviceOwner(admin1, "owner-name", UserHandle.USER_SYSTEM)).isTrue(); // getDeviceOwnerComponent should return the admin1 component. assertThat(dpm.getDeviceOwnerComponentOnCallingUser()).isEqualTo(admin1); @@ -1311,7 +1311,8 @@ public class DevicePolicyManagerTest extends DpmTestBase { assertExpectException(IllegalArgumentException.class, /* messageRegex= */ "Invalid component", - () -> dpm.setDeviceOwner(new ComponentName("a.b.c", ".def"))); + () -> dpm.setDeviceOwner(new ComponentName("a.b.c", ".def"), /* ownerName= */ null, + UserHandle.USER_SYSTEM)); } @Test @@ -1346,7 +1347,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID; setUpPackageManagerForAdmin(admin1, DpmMockContext.CALLER_SYSTEM_USER_UID); dpm.setActiveAdmin(admin1, /* replace =*/ false); - assertThat(dpm.setDeviceOwner(admin1, "owner-name")).isTrue(); + assertThat(dpm.setDeviceOwner(admin1, "owner-name", UserHandle.USER_SYSTEM)).isTrue(); // Verify internal calls. verify(getServices().iactivityManager, times(1)).updateDeviceOwner( @@ -1410,7 +1411,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID; setUpPackageManagerForAdmin(admin1, DpmMockContext.CALLER_SYSTEM_USER_UID); dpm.setActiveAdmin(admin1, /* replace =*/ false); - assertThat(dpm.setDeviceOwner(admin1, "owner-name")).isTrue(); + assertThat(dpm.setDeviceOwner(admin1, "owner-name", UserHandle.USER_SYSTEM)).isTrue(); verify(getServices().ibackupManager, times(1)).setBackupServiceActive( eq(UserHandle.USER_SYSTEM), eq(false)); @@ -1451,7 +1452,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID; setUpPackageManagerForAdmin(admin1, DpmMockContext.CALLER_SYSTEM_USER_UID); dpm.setActiveAdmin(admin1, /* replace =*/ false); - assertThat(dpm.setDeviceOwner(admin1, "owner-name")).isTrue(); + assertThat(dpm.setDeviceOwner(admin1, "owner-name", UserHandle.USER_SYSTEM)).isTrue(); // Verify internal calls. verify(getServices().iactivityManager, times(1)).updateDeviceOwner( @@ -3026,7 +3027,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { // Set a device owner on the system user. Check that the system user becomes affiliated. setUpPackageManagerForAdmin(admin1, DpmMockContext.CALLER_SYSTEM_USER_UID); dpm.setActiveAdmin(admin1, /* replace =*/ false); - assertThat(dpm.setDeviceOwner(admin1, "owner-name")).isTrue(); + assertThat(dpm.setDeviceOwner(admin1, "owner-name", UserHandle.USER_SYSTEM)).isTrue(); assertThat(dpm.isAffiliatedUser()).isTrue(); assertThat(dpm.getAffiliationIds(admin1).isEmpty()).isTrue();