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

Commit 47815b50 authored by Piotr Karzelek's avatar Piotr Karzelek
Browse files

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
parent d10c7b32

packages/SettingsProvider/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ android_test { 
        "truth",

        "Nene",

        "Harrier",

        "bedstead-enterprise",

    ],

    libs: [

        "android.test.base.stubs.system",

packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderMultiUsersTest.java

+6 −3
Original line number Diff line number Diff line
@@ -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());

services/tests/PackageManagerServiceTests/appenumeration/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ android_test { 
        "androidx.test.runner",

        "truth",

        "Harrier",

        "bedstead-multiuser",

    ],

    platform_apis: true,

    certificate: "platform",

services/tests/PackageManagerServiceTests/appenumeration/src/com/android/server/pm/test/appenumeration/CrossUserPackageVisibilityTests.java

+3 −2
Original line number Diff line number Diff line
@@ -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;

        }