Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-04 11:30:24 +00:00
committed by Android (Google) Code Review
parent 19a2adb33b bb5a62d8d7
commit 6925a160d0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,7 +207,7 @@ public class GameManagerServiceTests {
} }
private void mockDeviceConfigInvalid() { private void mockDeviceConfigInvalid() {
String configString = "mode=2,downscaleFactor=0.55"; String configString = "";
when(DeviceConfig.getProperty(anyString(), anyString())) when(DeviceConfig.getProperty(anyString(), anyString()))
.thenReturn(configString); .thenReturn(configString);
} }
@@ -373,11 +373,12 @@ public class GameManagerServiceTests {
*/ */
@Test @Test
public void testSetGameModePermissionDenied() { public void testSetGameModePermissionDenied() {
mockModifyGameModeGranted();
mockDeviceConfigAll();
GameManagerService gameManagerService = new GameManagerService(mMockContext); GameManagerService gameManagerService = new GameManagerService(mMockContext);
gameManagerService.onUserStarting(USER_ID_1); gameManagerService.onUserStarting(USER_ID_1);
// Update the game mode so we can read back something valid. // Update the game mode so we can read back something valid.
mockModifyGameModeGranted();
gameManagerService.setGameMode(mPackageName, GameManager.GAME_MODE_STANDARD, USER_ID_1); gameManagerService.setGameMode(mPackageName, GameManager.GAME_MODE_STANDARD, USER_ID_1);
assertEquals(GameManager.GAME_MODE_STANDARD, assertEquals(GameManager.GAME_MODE_STANDARD,
gameManagerService.getGameMode(mPackageName, USER_ID_1)); gameManagerService.getGameMode(mPackageName, USER_ID_1));