From e4a5cdbd95d97e4a1c2be9dea889a2ced922595f Mon Sep 17 00:00:00 2001 From: Peiyong Lin Date: Sat, 8 Jul 2023 22:20:36 +0000 Subject: [PATCH] Partially revert the usage of string enum. There's a regression in showmap_rss_bytes, after looking into the whole showmap, the increase mostly came from framework, after partially revert the usage of string enum, the showmap_rss_bytes number seems to decrease consistently. Bug: b/289956225 Bug: b/283858001 Test: forrest test Change-Id: I3f548ac2bc437394d7da7d0a88090dd3aa27d7f8 --- core/java/android/os/GraphicsEnvironment.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/core/java/android/os/GraphicsEnvironment.java b/core/java/android/os/GraphicsEnvironment.java index 7664bada2c289..ff8e3a03b77b8 100644 --- a/core/java/android/os/GraphicsEnvironment.java +++ b/core/java/android/os/GraphicsEnvironment.java @@ -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 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("default"), - ANGLE("angle"), - NATIVE("native"); - - public final String choice; - - AngleDriverChoice(String choice) { - this.choice = choice; - } + 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