Merge "Add ANGLE_ENABLED_APP to CoreSettings" (70687b77) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}

+4 −5

Original line number	Diff line number	Diff line
		@@ -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();

+1 −0

Original line number	Diff line number	Diff line
		@@ -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...
		}