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

Commit 45a6eae8 authored by Yiwei Zhang's avatar Yiwei Zhang Committed by android-build-merger
Browse files

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

am: ca354f30

Change-Id: I62ade6ba3b577080b32165c7c03ce61a66448bb3
parents 282048a2 ca354f30

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -12681,6 +12681,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>

































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



+3
−0




























Original line number
Diff line number
Diff line








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

















































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



+1
−0




























Original line number
Diff line number
Diff line








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

































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

































services/core/java/com/android/server/am/CoreSettingsObserver.java



+2
−0




























Original line number
Diff line number
Diff line








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