From 47815b50c2fa943d598b57592be036778844acd2 Mon Sep 17 00:00:00 2001 From: Piotr Karzelek Date: Wed, 16 Oct 2024 13:19:15 +0000 Subject: remove multi-user and enterprise deprecated functions from DeviceState Test: atest HarrierTest:com.android.bedstead.harrier.MainAnnotationExecutorTest Test: atest CtsDevicePolicyTestCases:android.devicepolicy.cts.UserTest Flag: TEST_ONLY Bug: 334025286 Bug: 336991736 Change-Id: I1d47cc46d07eb3662ef831718f4ea0a7d0be12c1 --- packages/SettingsProvider/Android.bp | 1 + .../providers/settings/SettingsProviderMultiUsersTest.java | 9 ++++++--- .../tests/PackageManagerServiceTests/appenumeration/Android.bp | 1 + .../pm/test/appenumeration/CrossUserPackageVisibilityTests.java | 5 +++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/packages/SettingsProvider/Android.bp b/packages/SettingsProvider/Android.bp index 65b22758946d..00ae05ceabd4 100644 --- a/packages/SettingsProvider/Android.bp +++ b/packages/SettingsProvider/Android.bp @@ -76,6 +76,7 @@ android_test { "truth", "Nene", "Harrier", + "bedstead-enterprise", ], libs: [ "android.test.base.stubs.system", diff --git a/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderMultiUsersTest.java b/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderMultiUsersTest.java index e86e72712b48..9cce43160b52 100644 --- a/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderMultiUsersTest.java +++ b/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderMultiUsersTest.java @@ -20,6 +20,9 @@ import static android.provider.Settings.Secure.ACCESSIBILITY_ENABLED; import static android.provider.Settings.Secure.SYNC_PARENT_SOUNDS; import static android.provider.Settings.System.RINGTONE; +import static com.android.bedstead.enterprise.EnterpriseDeviceStateExtensionsKt.workProfile; +import static com.android.bedstead.multiuser.MultiUserDeviceStateExtensionsKt.secondaryUser; + import static com.google.common.truth.Truth.assertThat; import android.content.pm.PackageManager; @@ -82,7 +85,7 @@ public class SettingsProviderMultiUsersTest { @RequireFeature(PackageManager.FEATURE_MANAGED_USERS) @EnsureHasWorkProfile public void testSettings_workProfile() throws Exception { - UserReference profile = sDeviceState.workProfile(); + UserReference profile = workProfile(sDeviceState); // Settings.Global settings are shared between different users assertSettingsShared(SPACE_GLOBAL, mPrimaryUser.id(), profile.id()); @@ -96,7 +99,7 @@ public class SettingsProviderMultiUsersTest { @RequireRunOnInitialUser @EnsureHasSecondaryUser public void testSettings_secondaryUser() throws Exception { - UserReference secondaryUser = sDeviceState.secondaryUser(); + UserReference secondaryUser = secondaryUser(sDeviceState); // Settings.Global settings are shared between different users assertSettingsShared(SPACE_GLOBAL, mPrimaryUser.id(), secondaryUser.id()); @@ -223,7 +226,7 @@ public class SettingsProviderMultiUsersTest { @RequireRunOnInitialUser @EnsureHasSecondaryUser public void testSettings_stopAndRestartSecondaryUser() throws Exception { - UserReference secondaryUser = sDeviceState.secondaryUser(); + UserReference secondaryUser = secondaryUser(sDeviceState); assertSettingsDifferent(SPACE_SECURE, mPrimaryUser.id(), secondaryUser.id()); diff --git a/services/tests/PackageManagerServiceTests/appenumeration/Android.bp b/services/tests/PackageManagerServiceTests/appenumeration/Android.bp index f15e533fee2b..2f00a1bb3c8c 100644 --- a/services/tests/PackageManagerServiceTests/appenumeration/Android.bp +++ b/services/tests/PackageManagerServiceTests/appenumeration/Android.bp @@ -32,6 +32,7 @@ android_test { "androidx.test.runner", "truth", "Harrier", + "bedstead-multiuser", ], platform_apis: true, certificate: "platform", diff --git a/services/tests/PackageManagerServiceTests/appenumeration/src/com/android/server/pm/test/appenumeration/CrossUserPackageVisibilityTests.java b/services/tests/PackageManagerServiceTests/appenumeration/src/com/android/server/pm/test/appenumeration/CrossUserPackageVisibilityTests.java index 70a2d4847ce7..48cebd7dcb04 100644 --- a/services/tests/PackageManagerServiceTests/appenumeration/src/com/android/server/pm/test/appenumeration/CrossUserPackageVisibilityTests.java +++ b/services/tests/PackageManagerServiceTests/appenumeration/src/com/android/server/pm/test/appenumeration/CrossUserPackageVisibilityTests.java @@ -22,6 +22,7 @@ import static android.Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS; import static android.Manifest.permission.MOVE_PACKAGE; import static android.content.pm.PackageManager.MOVE_FAILED_DOESNT_EXIST; +import static com.android.bedstead.multiuser.MultiUserDeviceStateExtensionsKt.secondaryUser; import static com.android.compatibility.common.util.ShellUtils.runShellCommand; import static com.google.common.truth.Truth.assertThat; @@ -112,9 +113,9 @@ public class CrossUserPackageVisibilityTests { final UserReference primaryUser = sDeviceState.primaryUser(); if (primaryUser.id() == UserHandle.myUserId()) { mCurrentUser = primaryUser; - mOtherUser = sDeviceState.secondaryUser(); + mOtherUser = secondaryUser(sDeviceState); } else { - mCurrentUser = sDeviceState.secondaryUser(); + mCurrentUser = secondaryUser(sDeviceState); mOtherUser = primaryUser; } -- cgit v1.2.3-59-g8ed1b