From 1c9264057b84e7189a588f53db36b147cc60dacb Mon Sep 17 00:00:00 2001 From: Peiyong Lin Date: Tue, 11 Jul 2023 21:19:47 +0000 Subject: [PATCH] Revert "Partially revert the usage of string enum." This reverts commit e4a5cdbd95d97e4a1c2be9dea889a2ced922595f. Reason for revert: The dashboard number doesn't seem to recover. Bug: b/289956225 Bug: b/283858001 Change-Id: I118d301f4e3543f89d54251d3f45b4e09c71c44c Test: forrest test --- core/java/android/os/GraphicsEnvironment.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/core/java/android/os/GraphicsEnvironment.java b/core/java/android/os/GraphicsEnvironment.java index ff8e3a03b77b8..7664bada2c289 100644 --- a/core/java/android/os/GraphicsEnvironment.java +++ b/core/java/android/os/GraphicsEnvironment.java @@ -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