diff options
| author | Esteban Talavera <etalavera@google.com> | 2014-12-23 17:15:29 +0000 |
|---|---|---|
| committer | Esteban Talavera <etalavera@google.com> | 2014-12-24 09:38:13 +0000 |
| commit | 8add57224ffcf73705e507f1b73954e5de15eb88 (patch) | |
| tree | 0c097f1d4d8d7d19bf590bd49ad38f9da754b2af /services/tests | |
| parent | 898de6fd8c78d84ae1425e052b27a97ec6f230ad (diff) | |
| download | frameworks_base-8add57224ffcf73705e507f1b73954e5de15eb88.zip frameworks_base-8add57224ffcf73705e507f1b73954e5de15eb88.tar.gz frameworks_base-8add57224ffcf73705e507f1b73954e5de15eb88.tar.bz2 | |
Remove deprecated version of setProfileOwner that takes packageName
The ComponentName equivalent should be used instead.
Bug: 17654371
Change-Id: I7001e86ab1709b824944148a3c44af5243dacb83
Diffstat (limited to 'services/tests')
2 files changed, 23 insertions, 11 deletions
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/ApplicationRestrictionsTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/ApplicationRestrictionsTest.java index 8e8e4e6..ca270e7 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/ApplicationRestrictionsTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/ApplicationRestrictionsTest.java @@ -65,7 +65,7 @@ public class ApplicationRestrictionsTest extends AndroidTestCase { sDpm = (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE); Settings.Secure.putInt(context.getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE, 0); - sDpm.setProfileOwner(context.getPackageName(), "Test", UserHandle.myUserId()); + sDpm.setProfileOwner(sAdminReceiver, "Test", UserHandle.myUserId()); Settings.Secure.putInt(context.getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE, 1); // Remove the admin if already registered. It's async, so add it back @@ -132,4 +132,4 @@ public class ApplicationRestrictionsTest extends AndroidTestCase { Bundle returned = sDpm.getApplicationRestrictions(sAdminReceiver, RESTRICTED_APP); assertEquals(returned.getString("KEY_FANCY_TEXT"), fancyText); } -}
\ No newline at end of file +} diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DeviceOwnerTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DeviceOwnerTest.java index f913b97..7c3014c 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DeviceOwnerTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DeviceOwnerTest.java @@ -16,6 +16,7 @@ package com.android.server.devicepolicy; +import android.content.ComponentName; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.SmallTest; @@ -32,7 +33,7 @@ import java.io.ByteArrayOutputStream; public class DeviceOwnerTest extends AndroidTestCase { private ByteArrayInputStream mInputStreamForTest; - private ByteArrayOutputStream mOutputStreamForTest = new ByteArrayOutputStream(); + private final ByteArrayOutputStream mOutputStreamForTest = new ByteArrayOutputStream(); @SmallTest public void testDeviceOwnerOnly() throws Exception { @@ -46,13 +47,15 @@ public class DeviceOwnerTest extends AndroidTestCase { assertEquals("some.device.owner.package", in.getDeviceOwnerPackageName()); assertEquals("owner", in.getDeviceOwnerName()); - assertNull(in.getProfileOwnerPackageName(1)); + assertNull(in.getProfileOwnerComponent(1)); } @SmallTest public void testProfileOwnerOnly() throws Exception { DeviceOwner out = new DeviceOwner(null, mOutputStreamForTest); - out.setProfileOwner("some.profile.owner.package", "some-company", 1); + ComponentName admin = new ComponentName( + "some.profile.owner.package", "some.profile.owner.package.Class"); + out.setProfileOwner(admin, "some-company", 1); out.writeOwnerFile(); mInputStreamForTest = new ByteArrayInputStream(mOutputStreamForTest.toByteArray()); @@ -61,16 +64,24 @@ public class DeviceOwnerTest extends AndroidTestCase { assertNull(in.getDeviceOwnerPackageName()); assertNull(in.getDeviceOwnerName()); - assertEquals("some.profile.owner.package", in.getProfileOwnerPackageName(1)); + assertEquals(admin, in.getProfileOwnerComponent(1)); assertEquals("some-company", in.getProfileOwnerName(1)); } @SmallTest public void testDeviceAndProfileOwners() throws Exception { DeviceOwner out = new DeviceOwner(null, mOutputStreamForTest); + ComponentName profileAdmin = new ComponentName( + "some.profile.owner.package", "some.profile.owner.package.Class"); + ComponentName otherProfileAdmin = new ComponentName( + "some.other.profile.owner", "some.other.profile.owner.OtherClass"); + // Old code used package name rather than component name, so the class + // bit could be empty. + ComponentName legacyComponentName = new ComponentName("legacy.profile.owner.package", ""); out.setDeviceOwner("some.device.owner.package", "owner"); - out.setProfileOwner("some.profile.owner.package", "some-company", 1); - out.setProfileOwner("some.other.profile.owner", "some-other-company", 2); + out.setProfileOwner(profileAdmin, "some-company", 1); + out.setProfileOwner(otherProfileAdmin, "some-other-company", 2); + out.setProfileOwner(legacyComponentName, "legacy-company", 3); out.writeOwnerFile(); mInputStreamForTest = new ByteArrayInputStream(mOutputStreamForTest.toByteArray()); @@ -80,9 +91,10 @@ public class DeviceOwnerTest extends AndroidTestCase { assertEquals("some.device.owner.package", in.getDeviceOwnerPackageName()); assertEquals("owner", in.getDeviceOwnerName()); - assertEquals("some.profile.owner.package", in.getProfileOwnerPackageName(1)); + assertEquals(profileAdmin, in.getProfileOwnerComponent(1)); assertEquals("some-company", in.getProfileOwnerName(1)); - assertEquals("some.other.profile.owner", in.getProfileOwnerPackageName(2)); + assertEquals(otherProfileAdmin, in.getProfileOwnerComponent(2)); assertEquals("some-other-company", in.getProfileOwnerName(2)); + assertEquals(legacyComponentName, in.getProfileOwnerComponent(3)); } -}
\ No newline at end of file +} |