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

Commit b252da34 authored by Yao Li's avatar Yao Li
Browse files

Rename HSUM boot strategy const 

Rename the const so that a future new const can share the same prefix BOOT_STRATEGY_.

Bug: 424267322
Flag: EXEMPT mechanical change
Test: atest FrameworksMockingServicesTests:com.android.server.pm.UserManagerServiceMockedTest
Change-Id: Iec095d7d97110f0495a8ea3f059f9801984c4177
parent 5a2c8dbb

services/core/java/com/android/server/pm/UserManagerService.java

+7 −7
Original line number Diff line number Diff line
@@ -368,14 +368,14 @@ public class UserManagerService extends IUserManager.Stub { 


    // The boot user strategy for HSUM.

    @VisibleForTesting

    static final int BOOT_TO_PREVIOUS_OR_FIRST_SWITCHABLE_USER = 0;

    static final int BOOT_STRATEGY_TO_PREVIOUS_OR_FIRST_SWITCHABLE_USER = 0;

    @VisibleForTesting

    static final int BOOT_TO_HSU_FOR_PROVISIONED_DEVICE = 1;

    static final int BOOT_STRATEGY_TO_HSU_FOR_PROVISIONED_DEVICE = 1;



    @Retention(RetentionPolicy.SOURCE)

    @IntDef(flag = false, prefix = { "BOOT_TO_" }, value = {

            BOOT_TO_PREVIOUS_OR_FIRST_SWITCHABLE_USER,

            BOOT_TO_HSU_FOR_PROVISIONED_DEVICE})

    @IntDef(flag = false, prefix = { "BOOT_STRATEGY_" }, value = {

            BOOT_STRATEGY_TO_PREVIOUS_OR_FIRST_SWITCHABLE_USER,

            BOOT_STRATEGY_TO_HSU_FOR_PROVISIONED_DEVICE})

    @VisibleForTesting

    @interface BootStrategy {}
@@ -1471,9 +1471,9 @@ public class UserManagerService extends IUserManager.Stub { 
            final int bootStrategy = getContextResources()

                    .getInteger(com.android.internal.R.integer.config_hsumBootStrategy);

            switch (bootStrategy) {

                case BOOT_TO_PREVIOUS_OR_FIRST_SWITCHABLE_USER:

                case BOOT_STRATEGY_TO_PREVIOUS_OR_FIRST_SWITCHABLE_USER:

                    return getPreviousOrFirstSwitchableUser();

                case BOOT_TO_HSU_FOR_PROVISIONED_DEVICE:

                case BOOT_STRATEGY_TO_HSU_FOR_PROVISIONED_DEVICE:

                    return getBootUserBasedOnProvisioning();

                default:

                    Slogf.w(LOG_TAG, "Unknown HSUM boot strategy: %d", bootStrategy);

services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceMockedTest.java

+6 −6
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; 
import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify;

import static com.android.server.pm.UserJourneyLogger.USER_JOURNEY_DEMOTE_MAIN_USER;

import static com.android.server.pm.UserJourneyLogger.USER_JOURNEY_PROMOTE_MAIN_USER;

import static com.android.server.pm.UserManagerService.BOOT_TO_HSU_FOR_PROVISIONED_DEVICE;

import static com.android.server.pm.UserManagerService.BOOT_TO_PREVIOUS_OR_FIRST_SWITCHABLE_USER;

import static com.android.server.pm.UserManagerService.BOOT_STRATEGY_TO_HSU_FOR_PROVISIONED_DEVICE;

import static com.android.server.pm.UserManagerService.BOOT_STRATEGY_TO_PREVIOUS_OR_FIRST_SWITCHABLE_USER;



import static com.google.common.truth.Truth.assertThat;

import static com.google.common.truth.Truth.assertWithMessage;
@@ -258,7 +258,7 @@ public final class UserManagerServiceMockedTest { 


        mSpyResources = spy(mSpiedContext.getResources());

        when(mSpiedContext.getResources()).thenReturn(mSpyResources);

        mockHsumBootStrategy(BOOT_TO_PREVIOUS_OR_FIRST_SWITCHABLE_USER);

        mockHsumBootStrategy(BOOT_STRATEGY_TO_PREVIOUS_OR_FIRST_SWITCHABLE_USER);

        mockDisallowRemovingLastAdminUser(false);



        doReturn(mSpyResources).when(Resources::getSystem);
@@ -949,7 +949,7 @@ public final class UserManagerServiceMockedTest { 
        addSecondaryUser(USER_ID);

        addSecondaryUser(USER_ID2);

        mockProvisionedDevice(true);

        mockHsumBootStrategy(BOOT_TO_HSU_FOR_PROVISIONED_DEVICE);

        mockHsumBootStrategy(BOOT_STRATEGY_TO_HSU_FOR_PROVISIONED_DEVICE);



        assertThat(mUms.getBootUser()).isEqualTo(USER_SYSTEM);

    }
@@ -960,7 +960,7 @@ public final class UserManagerServiceMockedTest { 
        addSecondaryUser(USER_ID);

        addSecondaryUser(USER_ID2);

        mockProvisionedDevice(false);

        mockHsumBootStrategy(BOOT_TO_HSU_FOR_PROVISIONED_DEVICE);

        mockHsumBootStrategy(BOOT_STRATEGY_TO_HSU_FOR_PROVISIONED_DEVICE);

        // Even if the headless system user switchable flag is true, the boot user should be the

        // first switchable full user.

        mockCanSwitchToHeadlessSystemUser(true);
@@ -974,7 +974,7 @@ public final class UserManagerServiceMockedTest { 
        setSystemUserHeadless(true);

        removeNonSystemUsers();

        mockProvisionedDevice(false);

        mockHsumBootStrategy(BOOT_TO_HSU_FOR_PROVISIONED_DEVICE);

        mockHsumBootStrategy(BOOT_STRATEGY_TO_HSU_FOR_PROVISIONED_DEVICE);



        assertThrows(ServiceSpecificException.class,

                () -> mUms.getBootUser());