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

Commit 8ca30463 authored by Peiyong Lin's avatar Peiyong Lin
Browse files

[Cherry-pick] Removes ANGLE as an intervention. 

Now that ANGLE starts to become part of the platform, remove the code
that takes ANGLE as an intervention.

Bug: b/283781993
Test: atest CtsAngleDeveloperOptionHostTest -c
Change-Id: I9fca1eab03f5804f52e09fb51e08a806b0fc9972
Merged-In: I9fca1eab03f5804f52e09fb51e08a806b0fc9972
parent 25f82c5e

core/java/android/os/GraphicsEnvironment.java

+5 −29
Original line number Original line Diff line number Diff line
@@ -177,23 +177,6 @@ public class GraphicsEnvironment { 
        nativeToggleAngleAsSystemDriver(enabled);

        nativeToggleAngleAsSystemDriver(enabled);

    }

    }





    /**

     * Query to determine if the Game Mode has enabled ANGLE.

     */

    private boolean isAngleEnabledByGameMode(Context context, String packageName) {

        try {

            final boolean gameModeEnabledAngle =

                    (mGameManager != null) && mGameManager.isAngleEnabled(packageName);

            Log.v(TAG, "ANGLE GameManagerService for " + packageName + ": " + gameModeEnabledAngle);

            return gameModeEnabledAngle;

        } catch (SecurityException e) {

            Log.e(TAG, "Caught exception while querying GameManagerService if ANGLE is enabled "

                    + "for package: " + packageName);

        }



        return false;

    }



    /**

    /**

     * Query to determine the ANGLE driver choice.

     * Query to determine the ANGLE driver choice.

     */

     */
@@ -422,8 +405,7 @@ public class GraphicsEnvironment { 
     * 2) The per-application switch (i.e. Settings.Global.ANGLE_GL_DRIVER_SELECTION_PKGS and

     * 2) The per-application switch (i.e. Settings.Global.ANGLE_GL_DRIVER_SELECTION_PKGS and

     *    Settings.Global.ANGLE_GL_DRIVER_SELECTION_VALUES; which corresponds to the

     *    Settings.Global.ANGLE_GL_DRIVER_SELECTION_VALUES; which corresponds to the

     *    “angle_gl_driver_selection_pkgs” and “angle_gl_driver_selection_values” settings); if it

     *    “angle_gl_driver_selection_pkgs” and “angle_gl_driver_selection_values” settings); if it

     *    forces a choice;

     *    forces a choice.

     * 3) Use ANGLE if isAngleEnabledByGameMode() returns true;

     */

     */

    private String queryAngleChoiceInternal(Context context, Bundle bundle,

    private String queryAngleChoiceInternal(Context context, Bundle bundle,

                                                       String packageName) {

                                                       String packageName) {
@@ -457,10 +439,6 @@ public class GraphicsEnvironment { 
        Log.v(TAG, "  angle_gl_driver_selection_pkgs=" + optInPackages);

        Log.v(TAG, "  angle_gl_driver_selection_pkgs=" + optInPackages);

        Log.v(TAG, "  angle_gl_driver_selection_values=" + optInValues);

        Log.v(TAG, "  angle_gl_driver_selection_values=" + optInValues);





        final String gameModeChoice = isAngleEnabledByGameMode(context, packageName)

                                      ? ANGLE_GL_DRIVER_CHOICE_ANGLE

                                      : ANGLE_GL_DRIVER_CHOICE_DEFAULT;



        // Make sure we have good settings to use

        // Make sure we have good settings to use

        if (optInPackages.size() == 0 || optInPackages.size() != optInValues.size()) {

        if (optInPackages.size() == 0 || optInPackages.size() != optInValues.size()) {

            Log.v(TAG,

            Log.v(TAG,
@@ -469,7 +447,7 @@ public class GraphicsEnvironment { 
                            + optInPackages.size() + ", "

                            + optInPackages.size() + ", "

                        + "number of values: "

                        + "number of values: "

                            + optInValues.size());

                            + optInValues.size());

            return gameModeChoice;

            return ANGLE_GL_DRIVER_CHOICE_DEFAULT;

        }

        }





        // See if this application is listed in the per-application settings list

        // See if this application is listed in the per-application settings list
@@ -477,7 +455,7 @@ public class GraphicsEnvironment { 




        if (pkgIndex < 0) {

        if (pkgIndex < 0) {

            Log.v(TAG, packageName + " is not listed in per-application setting");

            Log.v(TAG, packageName + " is not listed in per-application setting");

            return gameModeChoice;

            return ANGLE_GL_DRIVER_CHOICE_DEFAULT;

        }

        }

        mAngleOptInIndex = pkgIndex;

        mAngleOptInIndex = pkgIndex;
@@ -491,11 +469,9 @@ public class GraphicsEnvironment { 
            return ANGLE_GL_DRIVER_CHOICE_ANGLE;

            return ANGLE_GL_DRIVER_CHOICE_ANGLE;

        } else if (optInValue.equals(ANGLE_GL_DRIVER_CHOICE_NATIVE)) {

        } else if (optInValue.equals(ANGLE_GL_DRIVER_CHOICE_NATIVE)) {

            return ANGLE_GL_DRIVER_CHOICE_NATIVE;

            return ANGLE_GL_DRIVER_CHOICE_NATIVE;

        } else {

            // The user either chose default or an invalid value; go with the default driver or what

            // the game mode indicates

            return gameModeChoice;

        }

        }

        // The user either chose default or an invalid value; go with the default driver.

        return ANGLE_GL_DRIVER_CHOICE_DEFAULT;

    }

    }





    /**

    /**