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

Commit 8a4ff858 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Reset game power hint on service start" into udc-qpr-dev am: ba309a0a 

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



Change-Id: I345b69a315a346a1686a3fbd1cddf43ce8814e73
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 28c0e5cc ba309a0a

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

+9 −0
Original line number Diff line number Diff line
@@ -346,6 +346,9 @@ public final class GameManagerService extends IGameManagerService.Stub { 
                        if (mHandler.hasMessages(CANCEL_GAME_LOADING_MODE)) {

                            mHandler.removeMessages(CANCEL_GAME_LOADING_MODE);

                        }

                        Slog.v(TAG, String.format(

                                "Game loading power mode %s (game state change isLoading=%b)",

                                        isLoading ? "ON" : "OFF", isLoading));

                        mPowerManagerInternal.setPowerMode(Mode.GAME_LOADING, isLoading);

                        if (isLoading) {

                            int loadingBoostDuration = getLoadingBoostDuration(packageName, userId);
@@ -369,6 +372,7 @@ public final class GameManagerService extends IGameManagerService.Stub { 
                    break;

                }

                case CANCEL_GAME_LOADING_MODE: {

                    Slog.v(TAG, "Game loading power mode OFF (loading boost ended)");

                    mPowerManagerInternal.setPowerMode(Mode.GAME_LOADING, false);

                    break;

                }
@@ -1279,6 +1283,7 @@ public final class GameManagerService extends IGameManagerService.Stub { 
                // instruction.

                mHandler.removeMessages(CANCEL_GAME_LOADING_MODE);

            } else {

                Slog.v(TAG, "Game loading power mode ON (loading boost on game start)");

                mPowerManagerInternal.setPowerMode(Mode.GAME_LOADING, true);

            }
@@ -1555,6 +1560,10 @@ public final class GameManagerService extends IGameManagerService.Stub { 
                }

            }

        }, new IntentFilter(Intent.ACTION_SHUTDOWN));

        Slog.v(TAG, "Game loading power mode OFF (game manager service start/restart)");

        mPowerManagerInternal.setPowerMode(Mode.GAME_LOADING, false);

        Slog.v(TAG, "Game power mode OFF (game manager service start/restart)");

        mPowerManagerInternal.setPowerMode(Mode.GAME, false);

    }



    private void sendUserMessage(int userId, int what, String eventForLog, int delayMillis) {

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

+8 −0
Original line number Diff line number Diff line
@@ -2156,6 +2156,14 @@ public class GameManagerServiceTests { 
        folder.delete();

    }



    @Test

    public void testResetGamePowerMode() {

        GameManagerService gameManagerService = createServiceAndStartUser(USER_ID_1);

        gameManagerService.onBootCompleted();

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

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

    }



    @Test

    public void testNotifyGraphicsEnvironmentSetup() {

        String configString = "mode=2,loadingBoost=2000";