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

Commit 32981ff4 authored by Yiwei Zhang's avatar Yiwei Zhang Committed by Android (Google) Code Review
Browse files

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

parents 2f2e353f 03f3ff20

core/java/android/provider/Settings.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -12392,6 +12392,14 @@ public final class Settings { 
         */

         */

        public static final String GAME_DRIVER_WHITELIST = "game_driver_whitelist";

        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







         * Ordered GPU debug layer list for Vulkan











         * i.e. <layer1>:<layer2>:...:<layerN>







         * i.e. <layer1>:<layer2>:...:<layerN>

































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



+2
−0




























Original line number
Original line
Diff line number
Diff line








@@ -453,6 +453,8 @@ message GlobalSettingsProto {









        optional SettingProto game_driver_blacklists = 14;







        optional SettingProto game_driver_blacklists = 14;











        // ANGLE - Show a dialog box when ANGLE is selected for the currently running PKG







        // ANGLE - Show a dialog box when ANGLE is selected for the currently running PKG











        optional SettingProto show_angle_in_use_dialog = 15;







        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;







    optional Gpu gpu = 59;





















































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



+1
−0




























Original line number
Original line
Diff line number
Diff line








@@ -494,6 +494,7 @@ public class SettingsBackupTest {









                    Settings.Global.GAME_DRIVER_BLACKLISTS,







                    Settings.Global.GAME_DRIVER_BLACKLISTS,











                    Settings.Global.GAME_DRIVER_BLACKLIST,







                    Settings.Global.GAME_DRIVER_BLACKLIST,











                    Settings.Global.GAME_DRIVER_WHITELIST,







                    Settings.Global.GAME_DRIVER_WHITELIST,














                    Settings.Global.GAME_DRIVER_SPHAL_LIBRARIES,











                    Settings.Global.GLOBAL_SETTINGS_SHOW_ANGLE_IN_USE_DIALOG_BOX,







                    Settings.Global.GLOBAL_SETTINGS_SHOW_ANGLE_IN_USE_DIALOG_BOX,











                    Settings.Global.GPU_DEBUG_LAYER_APP,







                    Settings.Global.GPU_DEBUG_LAYER_APP,











                    Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING,







                    Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING,

































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



+3
−0




























Original line number
Original line
Diff line number
Diff line








@@ -724,6 +724,9 @@ class SettingsProtoDumpUtil {









        dumpSetting(s, p,







        dumpSetting(s, p,











                Settings.Global.GAME_DRIVER_BLACKLISTS,







                Settings.Global.GAME_DRIVER_BLACKLISTS,











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







        p.end(gpuToken);































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







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

































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



+1
−0




























Original line number
Original line
Diff line number
Diff line








@@ -79,6 +79,7 @@ final class CoreSettingsObserver extends ContentObserver {









        sGlobalSettingToTypeMap.put(Settings.Global.GAME_DRIVER_BLACKLIST, String.class);







        sGlobalSettingToTypeMap.put(Settings.Global.GAME_DRIVER_BLACKLIST, String.class);











        sGlobalSettingToTypeMap.put(Settings.Global.GAME_DRIVER_WHITELIST, 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_BLACKLISTS, String.class);














        sGlobalSettingToTypeMap.put(Settings.Global.GAME_DRIVER_SPHAL_LIBRARIES, String.class);











        // add other global settings here...







        // add other global settings here...











    }







    }