commit 6925a160d0b539dfcc72663fb846b6618ca148d6
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Sep 04 11:30:24 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Sep 04 11:30:24 2021 +0000
tree 1e1bd91197dd3f8a1c69063788ccff366a5495d7
parent 19a2adb33b8e655d9e4452dbe6575baac947b6aa
parent bb5a62d8d7bccf294692a62b4546c58441d8d134

Merge "Fix failing GameManagerServiceTests" into sc-qpr1-dev

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

diff --git a/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java b/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java
index 8840057..85ef8f7 100644
--- a/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java
+++ b/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java
@@ -207,7 +207,7 @@
     }
 
     private void mockDeviceConfigInvalid() {
-        String configString = "mode=2,downscaleFactor=0.55";
+        String configString = "";
         when(DeviceConfig.getProperty(anyString(), anyString()))
                 .thenReturn(configString);
     }
@@ -373,11 +373,12 @@
      */
     @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));