Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2023-07-12 00:03:42 +00:00
committed by Android (Google) Code Review
parent 08589dd5b7 1c9264057b
commit f73d00ea7c
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/android/os/GraphicsEnvironment.java
View File

@@ -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