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

Commit 1c926405 authored by Peiyong Lin's avatar Peiyong Lin Committed by Android (Google) Code Review
Browse files

Revert "Partially revert the usage of string enum." 

This reverts commit e4a5cdbd.

Reason for revert: The dashboard number doesn't seem to recover.

Bug: b/289956225
Bug: b/283858001
Change-Id: I118d301f4e3543f89d54251d3f45b4e09c71c44c
Test: forrest test
parent e4a5cdbd

core/java/android/os/GraphicsEnvironment.java

+11 −9
Original line number Diff line number Diff line
@@ -112,14 +112,16 @@ public class GraphicsEnvironment { 
    private static final int ANGLE_GL_DRIVER_ALL_ANGLE_OFF = 0;



    // Values for ANGLE_GL_DRIVER_SELECTION_VALUES

    private static final String ANGLE_GL_DRIVER_CHOICE_DEFAULT = "default";

    private static final String ANGLE_GL_DRIVER_CHOICE_ANGLE = "angle";

    private static final String ANGLE_GL_DRIVER_CHOICE_NATIVE = "native";



    private enum AngleDriverChoice {

        DEFAULT,

        ANGLE,

        NATIVE,

        DEFAULT("default"),

        ANGLE("angle"),

        NATIVE("native");



        public final String choice;



        AngleDriverChoice(String choice) {

            this.choice = choice;

        }

    }



    private static final String PROPERTY_RO_ANGLE_SUPPORTED = "ro.gfx.angle.supported";
@@ -491,9 +493,9 @@ public class GraphicsEnvironment { 
        Log.v(TAG,

                "ANGLE Developer option for '" + packageName + "' "

                        + "set to: '" + optInValue + "'");

        if (optInValue.equals(ANGLE_GL_DRIVER_CHOICE_ANGLE)) {

        if (optInValue.equals(AngleDriverChoice.ANGLE.choice)) {

            return AngleDriverChoice.ANGLE;

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

        } else if (optInValue.equals(AngleDriverChoice.NATIVE.choice)) {

            return AngleDriverChoice.NATIVE;

        } else {

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