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

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

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

Change-Id: Ibb5229d8e8baf0e72af938ca8e69b35fc23de904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Peiyong Lin
2023-07-11 00:14:46 +00:00
committed by Automerger Merge Worker
parent a358d73cd1 26ad9a3a06
commit 47d0d9dac4
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,16 +112,14 @@ public class GraphicsEnvironment {
private static final int ANGLE_GL_DRIVER_ALL_ANGLE_OFF = 0; private static final int ANGLE_GL_DRIVER_ALL_ANGLE_OFF = 0;
// Values for ANGLE_GL_DRIVER_SELECTION_VALUES // 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 { private enum AngleDriverChoice {
DEFAULT("default"), DEFAULT,
ANGLE("angle"), ANGLE,
NATIVE("native"); NATIVE,
public final String choice;
AngleDriverChoice(String choice) {
this.choice = choice;
}
} }
private static final String PROPERTY_RO_ANGLE_SUPPORTED = "ro.gfx.angle.supported"; private static final String PROPERTY_RO_ANGLE_SUPPORTED = "ro.gfx.angle.supported";
@@ -493,9 +491,9 @@ public class GraphicsEnvironment {
Log.v(TAG, Log.v(TAG,
"ANGLE Developer option for '" + packageName + "' " "ANGLE Developer option for '" + packageName + "' "
+ "set to: '" + optInValue + "'"); + "set to: '" + optInValue + "'");
if (optInValue.equals(AngleDriverChoice.ANGLE.choice)) { if (optInValue.equals(ANGLE_GL_DRIVER_CHOICE_ANGLE)) {
return AngleDriverChoice.ANGLE; return AngleDriverChoice.ANGLE;
} else if (optInValue.equals(AngleDriverChoice.NATIVE.choice)) { } else if (optInValue.equals(ANGLE_GL_DRIVER_CHOICE_NATIVE)) {
return AngleDriverChoice.NATIVE; return AngleDriverChoice.NATIVE;
} else { } else {
// The user either chose default or an invalid value; go with the default driver or what // The user either chose default or an invalid value; go with the default driver or what