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

Commit 9c2ec7a4 authored by Xiang Wang's avatar Xiang Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix the bug that user setting is removed when switching" into tm-qpr-dev am: d16866aa 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20485639



Change-Id: I49070b9f6cbe276ba4d3ee9adc64e3cb2e3c58c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9931f45e d16866aa

services/core/java/com/android/server/app/GameManagerService.java

+6 −13
Original line number Diff line number Diff line
@@ -1276,20 +1276,12 @@ public final class GameManagerService extends IGameManagerService.Stub { 


    void onUserSwitching(TargetUser from, TargetUser to) {

        final int toUserId = to.getUserIdentifier();

        if (from != null) {

            synchronized (mLock) {

                final int fromUserId = from.getUserIdentifier();

                if (mSettings.containsKey(fromUserId)) {

                    final Message msg = mHandler.obtainMessage(REMOVE_SETTINGS);

                    msg.obj = fromUserId;

                    mHandler.sendMessage(msg);

                }

            }

        }

        // we want to re-populate the setting when switching user as the device config may have

        // changed, which will only update for the previous user, see

        // DeviceConfigListener#onPropertiesChanged.

        final Message msg = mHandler.obtainMessage(POPULATE_GAME_MODE_SETTINGS);

        msg.obj = toUserId;

        mHandler.sendMessage(msg);



        if (mGameServiceController != null) {

            mGameServiceController.notifyNewForegroundUser(to);

        }
@@ -1429,9 +1421,10 @@ public final class GameManagerService extends IGameManagerService.Stub { 
                Slog.v(TAG, "Package configuration not found for " + packageName);

                return;

            }

        }

        updateCompatModeDownscale(packageConfig, packageName, gameMode);

        } else {

            updateFps(packageConfig, packageName, gameMode, userId);

            updateCompatModeDownscale(packageConfig, packageName, gameMode);

        }

        updateUseAngle(packageName, gameMode);

    }

services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java

+32 −0
Original line number Diff line number Diff line
@@ -1490,6 +1490,38 @@ public class GameManagerServiceTests { 
    }



    @Test

    public void testSwitchUser() {

        mockManageUsersGranted();

        mockModifyGameModeGranted();



        mockDeviceConfigBattery();

        final Context context = InstrumentationRegistry.getContext();

        GameManagerService gameManagerService = new GameManagerService(mMockContext,

                mTestLooper.getLooper(), context.getFilesDir());

        startUser(gameManagerService, USER_ID_1);

        startUser(gameManagerService, USER_ID_2);

        gameManagerService.setGameMode(mPackageName, GameManager.GAME_MODE_BATTERY, USER_ID_1);

        checkReportedModes(gameManagerService, GameManager.GAME_MODE_STANDARD,

                GameManager.GAME_MODE_BATTERY);

        assertEquals(gameManagerService.getGameMode(mPackageName, USER_ID_1),

                GameManager.GAME_MODE_BATTERY);



        mockDeviceConfigAll();

        switchUser(gameManagerService, USER_ID_1, USER_ID_2);

        assertEquals(gameManagerService.getGameMode(mPackageName, USER_ID_2),

                GameManager.GAME_MODE_STANDARD);

        checkReportedModes(gameManagerService, GameManager.GAME_MODE_STANDARD,

                GameManager.GAME_MODE_BATTERY, GameManager.GAME_MODE_PERFORMANCE);

        gameManagerService.setGameMode(mPackageName, GameManager.GAME_MODE_PERFORMANCE, USER_ID_2);

        gameManagerService.setGameMode(mPackageName, GameManager.GAME_MODE_BATTERY, USER_ID_1);



        switchUser(gameManagerService, USER_ID_2, USER_ID_1);

        checkReportedModes(gameManagerService, GameManager.GAME_MODE_STANDARD,

                GameManager.GAME_MODE_BATTERY, GameManager.GAME_MODE_PERFORMANCE);

        gameManagerService.setGameMode(mPackageName, GameManager.GAME_MODE_PERFORMANCE, USER_ID_2);

        gameManagerService.setGameMode(mPackageName, GameManager.GAME_MODE_BATTERY, USER_ID_1);

    }



    public void testResetInterventions_onDeviceConfigReset() throws Exception {

        mockModifyGameModeGranted();

        String configStringBefore =