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

Commit 8e4bdb9c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "GameManagerService: Only apply game mode when the service is on the... 

Merge "GameManagerService: Only apply game mode when the service is on the TOP" into udc-d1-dev am: c7d85952

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



Change-Id: I4405d10d33843e4f6b7282a5c761030229d89625
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 479add1f c7d85952

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

+1 −1
Original line number Diff line number Diff line
@@ -2166,7 +2166,7 @@ public final class GameManagerService extends IGameManagerService.Stub { 
        @Override

        public void onUidStateChanged(int uid, int procState, long procStateSeq, int capability) {

            synchronized (mUidObserverLock) {

                if (ActivityManager.isProcStateBackground(procState)) {

                if (procState != ActivityManager.PROCESS_STATE_TOP) {

                    disableGameMode(uid);

                    return;

                }

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

+9 −9
Original line number Diff line number Diff line
@@ -2221,7 +2221,7 @@ public class GameManagerServiceTests { 
        String[] packages = {mPackageName};

        when(mMockPackageManager.getPackagesForUid(DEFAULT_PACKAGE_UID)).thenReturn(packages);

        gameManagerService.mUidObserver.onUidStateChanged(

                DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE, 0, 0);

                DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_TOP, 0, 0);

        verify(mMockPowerManager, times(1)).setPowerMode(Mode.GAME, true);

    }
@@ -2238,12 +2238,12 @@ public class GameManagerServiceTests { 
        doAnswer(inv -> powerState.put(inv.getArgument(0), inv.getArgument(1)))

                .when(mMockPowerManager).setPowerMode(anyInt(), anyBoolean());

        gameManagerService.mUidObserver.onUidStateChanged(

                DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE, 0, 0);

                DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_TOP, 0, 0);

        assertTrue(powerState.get(Mode.GAME));

        gameManagerService.mUidObserver.onUidStateChanged(

                DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND, 0, 0);

        gameManagerService.mUidObserver.onUidStateChanged(

                somePackageId, ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE, 0, 0);

                somePackageId, ActivityManager.PROCESS_STATE_TOP, 0, 0);

        assertTrue(powerState.get(Mode.GAME));

        gameManagerService.mUidObserver.onUidStateChanged(

                somePackageId, ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND, 0, 0);
@@ -2260,13 +2260,13 @@ public class GameManagerServiceTests { 
        int somePackageId = DEFAULT_PACKAGE_UID + 1;

        when(mMockPackageManager.getPackagesForUid(somePackageId)).thenReturn(packages2);

        gameManagerService.mUidObserver.onUidStateChanged(

                DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE, 0, 0);

                DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_TOP, 0, 0);

        gameManagerService.mUidObserver.onUidStateChanged(

                somePackageId, ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE, 0, 0);

                somePackageId, ActivityManager.PROCESS_STATE_TOP, 0, 0);

        gameManagerService.mUidObserver.onUidStateChanged(

                DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND, 0, 0);

                DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE, 0, 0);

        gameManagerService.mUidObserver.onUidStateChanged(

                somePackageId, ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND, 0, 0);

                somePackageId, ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE, 0, 0);

        verify(mMockPowerManager, times(1)).setPowerMode(Mode.GAME, true);

        verify(mMockPowerManager, times(1)).setPowerMode(Mode.GAME, false);

    }
@@ -2277,9 +2277,9 @@ public class GameManagerServiceTests { 
        String[] packages = {mPackageName};

        when(mMockPackageManager.getPackagesForUid(DEFAULT_PACKAGE_UID)).thenReturn(packages);

        gameManagerService.mUidObserver.onUidStateChanged(

                DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE, 0, 0);

                DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_TOP, 0, 0);

        gameManagerService.mUidObserver.onUidStateChanged(

                DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND, 0, 0);

                DEFAULT_PACKAGE_UID, ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE, 0, 0);

        verify(mMockPowerManager, times(1)).setPowerMode(Mode.GAME, false);

    }