Merge changes from topic "GameDriver" (a0bd6fd6) · Commits · e / os / android_frameworks_base

core/java/android/os/GraphicsEnvironment.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -156,7 +156,7 @@ public class GraphicsEnvironment {

		String applicationPackageName = context.getPackageName();
		String devOptInApplicationName = coreSettings.getString(
		Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP);
		Settings.Global.GUP_DEV_OPT_IN_APPS);
		boolean devOptIn = applicationPackageName.equals(devOptInApplicationName);
		boolean whitelisted = onWhitelist(context, driverPackageName, ai.packageName);
		if (!devOptIn && !whitelisted) {

+8 −3

Original line number	Diff line number	Diff line
		@@ -11446,11 +11446,16 @@ public final class Settings {
		public static final String GPU_DEBUG_APP = "gpu_debug_app";

		/**
		* App that is selected to use updated graphics driver.
		* Apps that are selected to use Game Update Package.
		* @hide
		*/
		public static final String UPDATED_GFX_DRIVER_DEV_OPT_IN_APP =
		"updated_gfx_driver_dev_opt_in_app";
		public static final String GUP_DEV_OPT_IN_APPS = "gup_dev_opt_in_apps";

		/**
		* Apps on the black list that are forbidden to useGame Update Package.
		* @hide
		*/
		public static final String GUP_BLACK_LIST = "gup_black_list";

		/**
		* Ordered GPU debug layer list

+5 −3

Original line number	Diff line number	Diff line
		@@ -384,9 +384,11 @@ message GlobalSettingsProto {
		// App allowed to load GPU debug layers.
		optional SettingProto debug_app = 1;
		optional SettingProto debug_layers = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
		// App opt in to load updated graphics driver instead of
		// native graphcis driver through developer options.
		optional SettingProto updated_gfx_driver_dev_opt_in_app = 6;
		// Apps opt in to load graphics driver from Game Update Package
		// instead of native graphcis driver through developer options.
		optional SettingProto gup_dev_opt_in_apps = 8;
		// Apps on the black list that are forbidden to useGame Update Package.
		optional SettingProto gup_black_list = 9;
		}
		optional Gpu gpu = 59;

+2 −1

Original line number	Diff line number	Diff line
		@@ -444,7 +444,8 @@ public class SettingsBackupTest {
		Settings.Global.ENABLE_GPU_DEBUG_LAYERS,
		Settings.Global.GPU_DEBUG_APP,
		Settings.Global.GPU_DEBUG_LAYERS,
		Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP,
		Settings.Global.GUP_DEV_OPT_IN_APPS,
		Settings.Global.GUP_BLACK_LIST,
		Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING,
		Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_PERSISTENT,
		Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_SLEEP_MILLIS,

+1 −1

Original line number	Diff line number	Diff line
		@@ -1133,5 +1133,5 @@
		<string name="notice_header" translatable="false"></string>

		<!-- UI debug setting: opt in to use updated graphics driver? [CHAR LIMIT=100] -->
		<string name="updated_gfx_driver_dev_opt_in_app_summary">Opt in app to use updated graphcis driver in developement</string>
		<string name="gup_dev_opt_in_app_summary">Opt in app to use Game Update Package in developement</string>
		</resources>