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

Commit 649719b6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Rename some method to indicate that should add lock to use this methods." into main

parents af343234 90ef63e9

services/art-wear-profile

+1 −1
Original line number Diff line number Diff line
@@ -7419,7 +7419,7 @@ PLcom/android/server/app/GameManagerService;->sendUserMessage(IILjava/lang/Strin 
PLcom/android/server/app/GameManagerService;->updateConfigsForUser(IZ[Ljava/lang/String;)V

PLcom/android/server/app/GameManagerService;->writeGameModeInterventionsToFile(I)V

PLcom/android/server/app/GameManagerSettings;-><init>(Ljava/io/File;)V

HPLcom/android/server/app/GameManagerSettings;->getConfigOverride(Ljava/lang/String;)Lcom/android/server/app/GameManagerService$GamePackageConfiguration;

HPLcom/android/server/app/GameManagerSettings;->getConfigOverrideLocked(Ljava/lang/String;)Lcom/android/server/app/GameManagerService$GamePackageConfiguration;

HPLcom/android/server/app/GameManagerSettings;->getGameModeLocked(Ljava/lang/String;)I

PLcom/android/server/app/GameManagerSettings;->readPersistentDataLocked()Z

PLcom/android/server/appbinding/AppBindingConstants;-><init>(Ljava/lang/String;)V

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

+9 −9
Original line number Diff line number Diff line
@@ -1422,10 +1422,10 @@ public final class GameManagerService extends IGameManagerService.Stub { 
            }

            final GameManagerSettings settings = mSettings.get(userId);

            // look for the existing GamePackageConfiguration override

            configOverride = settings.getConfigOverride(packageName);

            configOverride = settings.getConfigOverrideLocked(packageName);

            if (configOverride == null) {

                configOverride = new GamePackageConfiguration(packageName);

                settings.setConfigOverride(packageName, configOverride);

                settings.setConfigOverrideLocked(packageName, configOverride);

            }

        }

        GamePackageConfiguration.GameModeConfiguration internalConfig =
@@ -1758,10 +1758,10 @@ public final class GameManagerService extends IGameManagerService.Stub { 
            }

            final GameManagerSettings settings = mSettings.get(userId);

            // look for the existing GamePackageConfiguration override

            configOverride = settings.getConfigOverride(packageName);

            configOverride = settings.getConfigOverrideLocked(packageName);

            if (configOverride == null) {

                configOverride = new GamePackageConfiguration(packageName);

                settings.setConfigOverride(packageName, configOverride);

                settings.setConfigOverrideLocked(packageName, configOverride);

            }

        }

        // modify GameModeConfiguration intervention settings
@@ -1800,7 +1800,7 @@ public final class GameManagerService extends IGameManagerService.Stub { 
            }

            final GameManagerSettings settings = mSettings.get(userId);

            if (gameModeToReset != -1) {

                final GamePackageConfiguration configOverride = settings.getConfigOverride(

                final GamePackageConfiguration configOverride = settings.getConfigOverrideLocked(

                        packageName);

                if (configOverride == null) {

                    return;
@@ -1811,10 +1811,10 @@ public final class GameManagerService extends IGameManagerService.Stub { 
                }

                configOverride.removeModeConfig(gameModeToReset);

                if (!configOverride.hasActiveGameModeConfig()) {

                    settings.removeConfigOverride(packageName);

                    settings.removeConfigOverrideLocked(packageName);

                }

            } else {

                settings.removeConfigOverride(packageName);

                settings.removeConfigOverrideLocked(packageName);

            }

        }
@@ -2029,7 +2029,7 @@ public final class GameManagerService extends IGameManagerService.Stub { 


        synchronized (mLock) {

            if (mSettings.containsKey(userId)) {

                overrideConfig = mSettings.get(userId).getConfigOverride(packageName);

                overrideConfig = mSettings.get(userId).getConfigOverrideLocked(packageName);

            }

        }

        if (overrideConfig == null || config == null) {
@@ -2074,7 +2074,7 @@ public final class GameManagerService extends IGameManagerService.Stub { 
                                }

                                synchronized (mLock) {

                                    if (mSettings.containsKey(userId)) {

                                        mSettings.get(userId).removeGame(packageName);

                                        mSettings.get(userId).removeGameLocked(packageName);

                                    }

                                    sendUserMessage(userId, WRITE_SETTINGS,

                                            Intent.ACTION_PACKAGE_REMOVED, WRITE_DELAY_MILLIS);

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

+4 −4
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ public class GameManagerSettings { 
     * Removes all game settings of a given package.

     * This operation must be synced with an external lock.

     */

    void removeGame(String packageName) {

    void removeGameLocked(String packageName) {

        mGameModes.remove(packageName);

        mConfigOverrides.remove(packageName);

    }
@@ -125,7 +125,7 @@ public class GameManagerSettings { 
     * Returns the game config override of a given package or null if absent.

     * This operation must be synced with an external lock.

     */

    GamePackageConfiguration getConfigOverride(String packageName) {

    GamePackageConfiguration getConfigOverrideLocked(String packageName) {

        return mConfigOverrides.get(packageName);

    }
@@ -133,7 +133,7 @@ public class GameManagerSettings { 
     * Sets the game config override of a given package.

     * This operation must be synced with an external lock.

     */

    void setConfigOverride(String packageName, GamePackageConfiguration configOverride) {

    void setConfigOverrideLocked(String packageName, GamePackageConfiguration configOverride) {

        mConfigOverrides.put(packageName, configOverride);

    }
@@ -141,7 +141,7 @@ public class GameManagerSettings { 
     * Removes the game mode config override of a given package.

     * This operation must be synced with an external lock.

     */

    void removeConfigOverride(String packageName) {

    void removeConfigOverrideLocked(String packageName) {

        mConfigOverrides.remove(packageName);

    }

services/tests/servicestests/src/com/android/server/app/GameManagerServiceSettingsTests.java

+15 −15
Original line number Diff line number Diff line
@@ -130,9 +130,9 @@ public class GameManagerServiceSettingsTests { 
        assertEquals(GameManager.GAME_MODE_STANDARD, settings.getGameModeLocked(PACKAGE_NAME_4));



        // test game mode configs

        assertNull(settings.getConfigOverride(PACKAGE_NAME_1));

        assertNull(settings.getConfigOverride(PACKAGE_NAME_3));

        GamePackageConfiguration config = settings.getConfigOverride(PACKAGE_NAME_2);

        assertNull(settings.getConfigOverrideLocked(PACKAGE_NAME_1));

        assertNull(settings.getConfigOverrideLocked(PACKAGE_NAME_3));

        GamePackageConfiguration config = settings.getConfigOverrideLocked(PACKAGE_NAME_2);

        assertNotNull(config);



        assertNull(config.getGameModeConfiguration(GameManager.GAME_MODE_STANDARD));
@@ -152,7 +152,7 @@ public class GameManagerServiceSettingsTests { 
        assertEquals(batteryConfig.getFpsStr(), GameModeConfiguration.DEFAULT_FPS);

        assertFalse(batteryConfig.getUseAngle());



        config = settings.getConfigOverride(PACKAGE_NAME_4);

        config = settings.getConfigOverrideLocked(PACKAGE_NAME_4);

        assertNotNull(config);

        GameModeConfiguration customConfig = config.getGameModeConfiguration(

                GameManager.GAME_MODE_CUSTOM);
@@ -177,7 +177,7 @@ public class GameManagerServiceSettingsTests { 
        GameManagerSettings settings = new GameManagerSettings(context.getFilesDir());

        assertTrue(settings.readPersistentDataLocked());



        final GamePackageConfiguration config = settings.getConfigOverride(PACKAGE_NAME_1);

        final GamePackageConfiguration config = settings.getConfigOverrideLocked(PACKAGE_NAME_1);

        assertNotNull(config);

        final GameModeConfiguration batteryConfig = config.getGameModeConfiguration(

                GameManager.GAME_MODE_BATTERY);
@@ -218,7 +218,7 @@ public class GameManagerServiceSettingsTests { 
        assertEquals(2, settings.getGameModeLocked(PACKAGE_NAME_2));

        assertEquals(3, settings.getGameModeLocked(PACKAGE_NAME_3));



        final GamePackageConfiguration config = settings.getConfigOverride(PACKAGE_NAME_2);

        final GamePackageConfiguration config = settings.getConfigOverrideLocked(PACKAGE_NAME_2);

        assertNotNull(config);

        final GameModeConfiguration batteryConfig = config.getGameModeConfiguration(

                GameManager.GAME_MODE_BATTERY);
@@ -248,7 +248,7 @@ public class GameManagerServiceSettingsTests { 
        GameModeConfiguration batteryConfig = config.getOrAddDefaultGameModeConfiguration(

                GameManager.GAME_MODE_BATTERY);

        batteryConfig.setScaling(0.77f);

        settings.setConfigOverride(PACKAGE_NAME_2, config);

        settings.setConfigOverrideLocked(PACKAGE_NAME_2, config);



        // set config for app4

        config = new GamePackageConfiguration(PACKAGE_NAME_4);
@@ -256,15 +256,15 @@ public class GameManagerServiceSettingsTests { 
                GameManager.GAME_MODE_CUSTOM);

        customConfig.setScaling(0.4f);

        customConfig.setFpsStr("30");

        settings.setConfigOverride(PACKAGE_NAME_4, config);

        settings.setConfigOverrideLocked(PACKAGE_NAME_4, config);



        settings.writePersistentDataLocked();



        // clear the settings in memory

        settings.removeGame(PACKAGE_NAME_1);

        settings.removeGame(PACKAGE_NAME_2);

        settings.removeGame(PACKAGE_NAME_3);

        settings.removeGame(PACKAGE_NAME_4);

        settings.removeGameLocked(PACKAGE_NAME_1);

        settings.removeGameLocked(PACKAGE_NAME_2);

        settings.removeGameLocked(PACKAGE_NAME_3);

        settings.removeGameLocked(PACKAGE_NAME_4);



        // read back in and verify

        assertTrue(settings.readPersistentDataLocked());
@@ -273,9 +273,9 @@ public class GameManagerServiceSettingsTests { 
        assertEquals(1, settings.getGameModeLocked(PACKAGE_NAME_3));

        assertEquals(1, settings.getGameModeLocked(PACKAGE_NAME_4));



        config = settings.getConfigOverride(PACKAGE_NAME_1);

        config = settings.getConfigOverrideLocked(PACKAGE_NAME_1);

        assertNull(config);

        config = settings.getConfigOverride(PACKAGE_NAME_2);

        config = settings.getConfigOverrideLocked(PACKAGE_NAME_2);

        assertNotNull(config);

        batteryConfig = config.getGameModeConfiguration(GameManager.GAME_MODE_BATTERY);

        assertNotNull(batteryConfig);
@@ -292,7 +292,7 @@ public class GameManagerServiceSettingsTests { 
        assertEquals(performanceConfig.getFpsStr(), "60");

        assertTrue(performanceConfig.getUseAngle());



        config = settings.getConfigOverride(PACKAGE_NAME_4);

        config = settings.getConfigOverrideLocked(PACKAGE_NAME_4);

        assertNotNull(config);

        customConfig = config.getGameModeConfiguration(GameManager.GAME_MODE_CUSTOM);

        assertNotNull(customConfig);