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

Commit 19c970c1 authored by Tim Van Patten's avatar Tim Van Patten Committed by Android (Google) Code Review
Browse files

Merge "Allow enabling ANGLE for GAME_MODE_STANDARD"

parents 5ee0a77a 02b892b1

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

+2 −1
Original line number Diff line number Diff line
@@ -385,7 +385,8 @@ public final class GameManagerService extends IGameManagerService.Stub { 
            }



            public boolean isValid() {

                return mGameMode == GameManager.GAME_MODE_PERFORMANCE

                return mGameMode == GameManager.GAME_MODE_STANDARD

                        || mGameMode == GameManager.GAME_MODE_PERFORMANCE

                        || mGameMode == GameManager.GAME_MODE_BATTERY;

            }

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

+3 −9
Original line number Diff line number Diff line
@@ -167,15 +167,9 @@ public class GameManagerShellCommand extends ShellCommand { 
        switch (gameMode.toLowerCase()) {

            case "1":

            case "standard":

                // Standard should only be available if other game modes are.

                if (batteryModeSupported || perfModeSupported) {

                    service.setGameMode(packageName, GameManager.GAME_MODE_STANDARD,

                            userId);

                } else {

                    pw.println("Game mode: " + gameMode + " not supported by "

                            + packageName);

                    return -1;

                }

                // Standard mode can be used to specify loading ANGLE as the default OpenGL ES

                // driver, so it should always be available.

                service.setGameMode(packageName, GameManager.GAME_MODE_STANDARD, userId);

                break;

            case "2":

            case "performance":