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

Commit 85084498 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ia87b8d3163e29c35fea3c49722d1d22ccb40c11d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 533a9323 f73d00ea

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