Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82c9a92d authored Jan 24, 2019 by TreeHugger Robot Committed by Android (Google) Code Review Jan 24, 2019

Merge "[Game Driver] Add support for whitelist."

parents 1ea41481 b3b4cce6

core/java/android/provider/Settings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -12157,6 +12157,14 @@ public final class Settings {
		*/
		public static final String GUP_BLACKLIST = "gup_blacklist";

		/**
		* Apps on the whitelist that are allowed to use Game Driver.
		* The string is a list of application package names, seperated by comma.
		* i.e. <apk1>,<apk2>,...,<apkN>
		* @hide
		*/
		public static final String GAME_DRIVER_WHITELIST = "game_driver_whitelist";

		/**
		* Ordered GPU debug layer list for Vulkan
		* i.e. <layer1>:<layer2>:...:<layerN>

core/proto/android/providers/settings/global.proto

+2 −0

Original line number	Diff line number	Diff line
		@@ -449,6 +449,8 @@ message GlobalSettingsProto {
		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;
		// List of Apps that are allowed to use Game Driver package.
		optional SettingProto game_driver_whitelist = 12;
		}
		optional Gpu gpu = 59;

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -486,6 +486,7 @@ public class SettingsBackupTest {
		Settings.Global.GUP_DEV_OPT_IN_APPS,
		Settings.Global.GUP_DEV_OPT_OUT_APPS,
		Settings.Global.GUP_BLACKLIST,
		Settings.Global.GAME_DRIVER_WHITELIST,
		Settings.Global.GPU_DEBUG_LAYER_APP,
		Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING,
		Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_PERSISTENT,

packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -715,6 +715,9 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Settings.Global.GUP_BLACKLIST,
		GlobalSettingsProto.Gpu.GUP_BLACKLIST);
		dumpSetting(s, p,
		Settings.Global.GAME_DRIVER_WHITELIST,
		GlobalSettingsProto.Gpu.GAME_DRIVER_WHITELIST);
		p.end(gpuToken);

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