From 4836fb16c9c2e1701121dace18bc677b08c33444 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Sun, 9 Jun 2019 15:10:57 -0700 Subject: [PATCH] Game Driver: Add settings global for prerelease driver opt in option Bug: 134881329 Test: build, flash and boot Change-Id: I8c3ba687f3c85f3fe093cdf7086adf9b8109713d --- core/java/android/provider/Settings.java | 8 ++++++++ core/proto/android/providers/settings/global.proto | 3 +++ .../src/android/provider/SettingsBackupTest.java | 1 + .../android/providers/settings/SettingsProtoDumpUtil.java | 3 +++ .../java/com/android/server/am/CoreSettingsObserver.java | 2 ++ 5 files changed, 17 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 5432e33bacf89..63bbf4c4081a5 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -12664,6 +12664,14 @@ public final class Settings { */ public static final String GAME_DRIVER_OPT_IN_APPS = "game_driver_opt_in_apps"; + /** + * List of Apps selected to use prerelease Game Driver. + * i.e. ,,..., + * @hide + */ + public static final String GAME_DRIVER_PRERELEASE_OPT_IN_APPS = + "game_driver_prerelease_opt_in_apps"; + /** * List of Apps selected not to use Game Driver. * i.e. ,,..., diff --git a/core/proto/android/providers/settings/global.proto b/core/proto/android/providers/settings/global.proto index 8f16b418f7dbc..00706941a18f3 100644 --- a/core/proto/android/providers/settings/global.proto +++ b/core/proto/android/providers/settings/global.proto @@ -457,6 +457,9 @@ message GlobalSettingsProto { optional SettingProto game_driver_sphal_libraries = 16; // ANGLE - External package containing ANGLE libraries optional SettingProto angle_debug_package = 17; + // Game Driver - List of Apps selected to use prerelease Game Driver + // i.e. ,,..., + optional SettingProto game_driver_prerelease_opt_in_apps = 18; } optional Gpu gpu = 59; diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index 9d5846440a13d..e4c16b3de7a27 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -495,6 +495,7 @@ public class SettingsBackupTest { Settings.Global.GLOBAL_SETTINGS_ANGLE_WHITELIST, Settings.Global.GAME_DRIVER_ALL_APPS, Settings.Global.GAME_DRIVER_OPT_IN_APPS, + Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS, Settings.Global.GAME_DRIVER_OPT_OUT_APPS, Settings.Global.GAME_DRIVER_BLACKLISTS, Settings.Global.GAME_DRIVER_BLACKLIST, diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 636808ebcb667..3cd82dfca6b6b 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -715,6 +715,9 @@ class SettingsProtoDumpUtil { dumpSetting(s, p, Settings.Global.GAME_DRIVER_OPT_IN_APPS, GlobalSettingsProto.Gpu.GAME_DRIVER_OPT_IN_APPS); + dumpSetting(s, p, + Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS, + GlobalSettingsProto.Gpu.GAME_DRIVER_PRERELEASE_OPT_IN_APPS); dumpSetting(s, p, Settings.Global.GAME_DRIVER_OPT_OUT_APPS, GlobalSettingsProto.Gpu.GAME_DRIVER_OPT_OUT_APPS); diff --git a/services/core/java/com/android/server/am/CoreSettingsObserver.java b/services/core/java/com/android/server/am/CoreSettingsObserver.java index b053d84de7d65..aa8bc04f0f7cb 100644 --- a/services/core/java/com/android/server/am/CoreSettingsObserver.java +++ b/services/core/java/com/android/server/am/CoreSettingsObserver.java @@ -76,6 +76,8 @@ final class CoreSettingsObserver extends ContentObserver { sGlobalSettingToTypeMap.put(Settings.Global.GPU_DEBUG_LAYER_APP, String.class); sGlobalSettingToTypeMap.put(Settings.Global.GAME_DRIVER_ALL_APPS, int.class); sGlobalSettingToTypeMap.put(Settings.Global.GAME_DRIVER_OPT_IN_APPS, String.class); + sGlobalSettingToTypeMap.put( + Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS, String.class); sGlobalSettingToTypeMap.put(Settings.Global.GAME_DRIVER_OPT_OUT_APPS, String.class); sGlobalSettingToTypeMap.put(Settings.Global.GAME_DRIVER_BLACKLIST, String.class); sGlobalSettingToTypeMap.put(Settings.Global.GAME_DRIVER_WHITELIST, String.class);