Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Game Driver: Add settings global for prerelease driver opt in option" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-13 00:31:24 +00:00
committed by Android (Google) Code Review
parent 2c52298236 4836fb16c9
commit ca354f308d
5 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/provider/Settings.java
View File

@@ -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. <pkg1>,<pkg2>,...,<pkgN>
* @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. <pkg1>,<pkg2>,...,<pkgN>

3
core/proto/android/providers/settings/global.proto
View File

@@ -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. <pkg1>,<pkg2>,...,<pkgN>
optional SettingProto game_driver_prerelease_opt_in_apps = 18;
}
optional Gpu gpu = 59;

1
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -492,6 +492,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,

3
packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
View File

@@ -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);

2
services/core/java/com/android/server/am/CoreSettingsObserver.java
View File

@@ -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);