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

Merge "Game Driver: Add a Settings.Global property for sphal libraries"

Browse Source
This commit is contained in:
Yiwei Zhang
2019-02-19 19:03:05 +00:00
committed by Android (Google) Code Review
parent 2f2e353f79 03f3ff20bf
commit 32981ff4d4
5 changed files with 15 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

@@ -12392,6 +12392,14 @@ public final class Settings {
*/
public static final String GAME_DRIVER_WHITELIST = "game_driver_whitelist";
/**
* List of libraries in sphal accessible by Game Driver
* The string is a list of library names, separated by colon.
* i.e. <lib1>:<lib2>:...:<libN>
* @hide
*/
public static final String GAME_DRIVER_SPHAL_LIBRARIES = "game_driver_sphal_libraries";
/**
* Ordered GPU debug layer list for Vulkan
* i.e. <layer1>:<layer2>:...:<layerN>

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

@@ -453,6 +453,8 @@ message GlobalSettingsProto {
optional SettingProto game_driver_blacklists = 14;
// ANGLE - Show a dialog box when ANGLE is selected for the currently running PKG
optional SettingProto show_angle_in_use_dialog = 15;
// Game Driver - List of libraries in sphal accessible by Game Driver
optional SettingProto game_driver_sphal_libraries = 16;
}
optional Gpu gpu = 59;

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

@@ -494,6 +494,7 @@ public class SettingsBackupTest {
Settings.Global.GAME_DRIVER_BLACKLISTS,
Settings.Global.GAME_DRIVER_BLACKLIST,
Settings.Global.GAME_DRIVER_WHITELIST,
Settings.Global.GAME_DRIVER_SPHAL_LIBRARIES,
Settings.Global.GLOBAL_SETTINGS_SHOW_ANGLE_IN_USE_DIALOG_BOX,
Settings.Global.GPU_DEBUG_LAYER_APP,
Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING,

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

@@ -724,6 +724,9 @@ class SettingsProtoDumpUtil {
dumpSetting(s, p,
Settings.Global.GAME_DRIVER_BLACKLISTS,
GlobalSettingsProto.Gpu.GAME_DRIVER_BLACKLISTS);
dumpSetting(s, p,
Settings.Global.GAME_DRIVER_SPHAL_LIBRARIES,
GlobalSettingsProto.Gpu.GAME_DRIVER_SPHAL_LIBRARIES);
p.end(gpuToken);
final long hdmiToken = p.start(GlobalSettingsProto.HDMI);

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

@@ -79,6 +79,7 @@ final class CoreSettingsObserver extends ContentObserver {
sGlobalSettingToTypeMap.put(Settings.Global.GAME_DRIVER_BLACKLIST, String.class);
sGlobalSettingToTypeMap.put(Settings.Global.GAME_DRIVER_WHITELIST, String.class);
sGlobalSettingToTypeMap.put(Settings.Global.GAME_DRIVER_BLACKLISTS, String.class);
sGlobalSettingToTypeMap.put(Settings.Global.GAME_DRIVER_SPHAL_LIBRARIES, String.class);
// add other global settings here...
}