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

Commit 47d0d9da authored by Peiyong Lin's avatar Peiyong Lin Committed by Automerger Merge Worker
Browse files

Merge "Partially revert the usage of string enum." into udc-qpr-dev am: 26ad9a3a 

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



Change-Id: Ibb5229d8e8baf0e72af938ca8e69b35fc23de904
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a358d73c 26ad9a3a

core/java/android/os/GraphicsEnvironment.java

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



    // Values for ANGLE_GL_DRIVER_SELECTION_VALUES

    private enum AngleDriverChoice {

        DEFAULT("default"),

        ANGLE("angle"),

        NATIVE("native");



        public final String choice;

    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";



        AngleDriverChoice(String choice) {

            this.choice = choice;

        }

    private enum AngleDriverChoice {

        DEFAULT,

        ANGLE,

        NATIVE,

    }



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

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

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

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

        if (optInValue.equals(ANGLE_GL_DRIVER_CHOICE_ANGLE)) {

            return AngleDriverChoice.ANGLE;

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

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

            return AngleDriverChoice.NATIVE;

        } else {

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