diff options
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 2 | ||||
| -rw-r--r-- | core/java/android/os/GraphicsEnvironment.java | 9 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/CoreSettingsObserver.java | 1 |
3 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 6754df9ac6fd..ff6aca6fa6c4 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -5666,7 +5666,7 @@ public final class ActivityThread extends ClientTransactionHandler { } } - GraphicsEnvironment.getInstance().setup(context); + GraphicsEnvironment.getInstance().setup(context, mCoreSettings); Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER); } diff --git a/core/java/android/os/GraphicsEnvironment.java b/core/java/android/os/GraphicsEnvironment.java index 54be6393e651..5f656207255a 100644 --- a/core/java/android/os/GraphicsEnvironment.java +++ b/core/java/android/os/GraphicsEnvironment.java @@ -54,9 +54,9 @@ public class GraphicsEnvironment { /** * Set up GraphicsEnvironment */ - public void setup(Context context) { + public void setup(Context context, Bundle coreSettings) { setupGpuLayers(context); - setupAngle(context); + setupAngle(context, coreSettings); chooseDriver(context); } @@ -135,11 +135,10 @@ public class GraphicsEnvironment { /** * Pass ANGLE details down to trigger enable logic */ - private static void setupAngle(Context context) { + private static void setupAngle(Context context, Bundle coreSettings) { String angleEnabledApp = - Settings.Global.getString(context.getContentResolver(), - Settings.Global.ANGLE_ENABLED_APP); + coreSettings.getString(Settings.Global.ANGLE_ENABLED_APP); String packageName = context.getPackageName(); diff --git a/services/core/java/com/android/server/am/CoreSettingsObserver.java b/services/core/java/com/android/server/am/CoreSettingsObserver.java index 160c753d9540..09c152ef5135 100644 --- a/services/core/java/com/android/server/am/CoreSettingsObserver.java +++ b/services/core/java/com/android/server/am/CoreSettingsObserver.java @@ -55,6 +55,7 @@ final class CoreSettingsObserver extends ContentObserver { // add other system settings here... sGlobalSettingToTypeMap.put(Settings.Global.DEBUG_VIEW_ATTRIBUTES, int.class); + sGlobalSettingToTypeMap.put(Settings.Global.ANGLE_ENABLED_APP, String.class); // add other global settings here... } |