Merge "GUP: Add a global property for genreal preference" (c631eead) · Commits · e / os / android_frameworks_base

core/java/android/os/GraphicsEnvironment.java

+24 −9

Original line number	Diff line number	Diff line
		@@ -480,6 +480,20 @@ public class GraphicsEnvironment {
		return;
		}

		// GUP_DEV_ALL_APPS
		// 0: Default (Invalid values fallback to default as well)
		// 1: All apps use Game Update Package
		// 2: All apps use system graphics driver
		int gupDevAllApps = coreSettings.getInt(Settings.Global.GUP_DEV_ALL_APPS, 0);
		if (gupDevAllApps == 2) {
		if (DEBUG) {
		Log.w(TAG, "GUP is turned off on this device");
		}
		return;
		}

		if (gupDevAllApps != 1) {
		// GUP_DEV_OPT_OUT_APPS has higher priority than GUP_DEV_OPT_IN_APPS
		if (getGlobalSettingsString(coreSettings, Settings.Global.GUP_DEV_OPT_OUT_APPS)
		.contains(ai.packageName)) {
		if (DEBUG) {
		@@ -496,6 +510,7 @@ public class GraphicsEnvironment {
		}
		return;
		}
		}

		ApplicationInfo driverInfo;
		try {

+15 −4

Original line number	Diff line number	Diff line
		@@ -11992,13 +11992,24 @@ public final class Settings {
		"angle_gl_driver_selection_values";

		/**
		* List of Apps selected to use Game Update Packages.
		* Game Update Package global preference for all Apps.
		* 0 = Default
		* 1 = All Apps use Game Update Package
		* 2 = All Apps use system graphics driver
		* @hide
		*/
		public static final String GUP_DEV_ALL_APPS = "gup_dev_all_apps";

		/**
		* List of Apps selected to use Game Update Package.
		* i.e. <pkg1>,<pkg2>,...,<pkgN>
		* @hide
		*/
		public static final String GUP_DEV_OPT_IN_APPS = "gup_dev_opt_in_apps";

		/**
		* List of Apps selected not to use Game Update Packages.
		* List of Apps selected not to use Game Update Package.
		* i.e. <pkg1>,<pkg2>,...,<pkgN>
		* @hide
		*/
		public static final String GUP_DEV_OPT_OUT_APPS = "gup_dev_opt_out_apps";
		@@ -12007,7 +12018,7 @@ public final class Settings {
		* Apps on the blacklist that are forbidden to use Game Update Package.
		* @hide
		*/
		public static final String GUP_BLACK_LIST = "gup_black_list";
		public static final String GUP_BLACKLIST = "gup_blacklist";

		/**
		* Ordered GPU debug layer list for Vulkan

+13 −6

Original line number	Diff line number	Diff line
		@@ -436,12 +436,19 @@ message GlobalSettingsProto {
		// Ordered GPU debug layer list for GLES
		// i.e. <layer1>:<layer2>:...:<layerN>
		optional SettingProto debug_layers_gles = 7;
		// GUP - List of Apps selected to use Game Update Packages
		optional SettingProto gup_dev_opt_in_apps = 8;
		// GUP - List of Apps selected not to use Game Update Packages
		optional SettingProto gup_dev_opt_out_apps = 9;
		// GUP - List of Apps that are forbidden to use Game Update Packages
		optional SettingProto gup_black_list = 10;
		// GUP - Game Update Package global preference for all Apps
		// 0 = Default
		// 1 = All Apps use Game Update Package
		// 2 = All Apps use system graphics driver
		optional SettingProto gup_dev_all_apps = 8;
		// GUP - List of Apps selected to use Game Update Package
		// i.e. <pkg1>,<pkg2>,...,<pkgN>
		optional SettingProto gup_dev_opt_in_apps = 9;
		// GUP - List of Apps selected not to use Game Update Package
		// i.e. <pkg1>,<pkg2>,...,<pkgN>
		optional SettingProto gup_dev_opt_out_apps = 10;
		// GUP - List of Apps that are forbidden to use Game Update Package
		optional SettingProto gup_blacklist = 11;
		}
		optional Gpu gpu = 59;

+2 −1

Original line number	Diff line number	Diff line
		@@ -478,9 +478,10 @@ public class SettingsBackupTest {
		Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_ALL_ANGLE,
		Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_PKGS,
		Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_VALUES,
		Settings.Global.GUP_DEV_ALL_APPS,
		Settings.Global.GUP_DEV_OPT_IN_APPS,
		Settings.Global.GUP_DEV_OPT_OUT_APPS,
		Settings.Global.GUP_BLACK_LIST,
		Settings.Global.GUP_BLACKLIST,
		Settings.Global.GPU_DEBUG_LAYER_APP,
		Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING,
		Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_PERSISTENT,

+5 −2

Original line number	Diff line number	Diff line
		@@ -704,6 +704,9 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Settings.Global.GPU_DEBUG_LAYERS_GLES,
		GlobalSettingsProto.Gpu.DEBUG_LAYERS_GLES);
		dumpSetting(s, p,
		Settings.Global.GUP_DEV_ALL_APPS,
		GlobalSettingsProto.Gpu.GUP_DEV_ALL_APPS);
		dumpSetting(s, p,
		Settings.Global.GUP_DEV_OPT_IN_APPS,
		GlobalSettingsProto.Gpu.GUP_DEV_OPT_IN_APPS);
		@@ -711,8 +714,8 @@ class SettingsProtoDumpUtil {
		Settings.Global.GUP_DEV_OPT_OUT_APPS,
		GlobalSettingsProto.Gpu.GUP_DEV_OPT_OUT_APPS);
		dumpSetting(s, p,
		Settings.Global.GUP_BLACK_LIST,
		GlobalSettingsProto.Gpu.GUP_BLACK_LIST);
		Settings.Global.GUP_BLACKLIST,
		GlobalSettingsProto.Gpu.GUP_BLACKLIST);
		p.end(gpuToken);

		final long hdmiToken = p.start(GlobalSettingsProto.HDMI);