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

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

Merge "ANGLE: Global.Settings should override GameManagerService"

parents 3ad25149 ef7aedfc

core/java/android/os/GraphicsEnvironment.java

+4 −3
Original line number Diff line number Diff line
@@ -192,14 +192,15 @@ public class GraphicsEnvironment { 


        // We only want to use ANGLE if the developer has explicitly chosen something other than

        // default driver.

        final boolean requested = devOptIn.equals(ANGLE_GL_DRIVER_CHOICE_ANGLE);

        if (requested) {

        final boolean forceAngle = devOptIn.equals(ANGLE_GL_DRIVER_CHOICE_ANGLE);

        final boolean forceNative = devOptIn.equals(ANGLE_GL_DRIVER_CHOICE_NATIVE);

        if (forceAngle || forceNative) {

            Log.v(TAG, "ANGLE developer option for " + packageName + ": " + devOptIn);

        }



        final boolean gameModeEnabledAngle = isAngleEnabledByGameMode(context, packageName);



        return requested || gameModeEnabledAngle;

        return !forceNative && (forceAngle || gameModeEnabledAngle);

    }



    private int getVulkanVersion(PackageManager pm) {

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

+3 −4
Original line number Diff line number Diff line
@@ -385,9 +385,8 @@ public final class GameManagerService extends IGameManagerService.Stub { 
            }



            public boolean isValid() {

                return (mGameMode == GameManager.GAME_MODE_PERFORMANCE

                        || mGameMode == GameManager.GAME_MODE_BATTERY)

                        && (!mAllowDownscale || getCompatChangeId() != 0);

                return mGameMode == GameManager.GAME_MODE_PERFORMANCE

                        || mGameMode == GameManager.GAME_MODE_BATTERY;

            }



            /**
@@ -839,7 +838,7 @@ public final class GameManagerService extends IGameManagerService.Stub { 
            }

            long scaleId = modeConfig.getCompatChangeId();

            if (scaleId == 0) {

                Slog.w(TAG, "Invalid downscaling change id " + scaleId + " for "

                Slog.i(TAG, "Invalid downscaling change id " + scaleId + " for "

                        + packageName);

                return;

            }