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

Commit 399e814c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix failing GameManagerServiceTests" into sc-qpr1-dev am: 6925a160 

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

Change-Id: I1baf803338d3be1f78dc277ae72c89ea1c84d73a
parents 6bd19fab 6925a160

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

+3 −2
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ public class GameManagerServiceTests { 
    }



    private void mockDeviceConfigInvalid() {

        String configString = "mode=2,downscaleFactor=0.55";

        String configString = "";

        when(DeviceConfig.getProperty(anyString(), anyString()))

                .thenReturn(configString);

    }
@@ -373,11 +373,12 @@ public class GameManagerServiceTests { 
     */

    @Test

    public void testSetGameModePermissionDenied() {

        mockModifyGameModeGranted();

        mockDeviceConfigAll();

        GameManagerService gameManagerService = new GameManagerService(mMockContext);

        gameManagerService.onUserStarting(USER_ID_1);



        // Update the game mode so we can read back something valid.

        mockModifyGameModeGranted();

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

        assertEquals(GameManager.GAME_MODE_STANDARD,

                gameManagerService.getGameMode(mPackageName, USER_ID_1));