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

Commit eb8d7cc3 authored by Yiwei Zhang's avatar Yiwei Zhang
Browse files

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

This change add the GAME_DRIVER_SPHAL_LIBRARIES property to save the
list of sphal libraries assessible to Game Driver.

Bug: 124448366
Test: Build, flash and boot.
Change-Id: I7cb06df80f19d87f5fd13d7df3c991ceb5bdfb06
Merged-In: I7cb06df80f19d87f5fd13d7df3c991ceb5bdfb06
Exempt-From-Owner-Approval: Change in CoreSettingsObserver.java is too
minor
parent db98f357

core/java/android/provider/Settings.java

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















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

































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



+2
−0




























Original line number
Diff line number
Diff line








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













        // Game Driver - List of blacklists, each blacklist is a blacklist for















        // a specific Game Driver version















        optional SettingProto game_driver_blacklists = 14;













        // Game Driver - List of libraries in sphal accessible by Game Driver













        optional SettingProto game_driver_sphal_libraries = 16;















    }















    optional Gpu gpu = 59;

















































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -450,6 +450,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.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING,















                    Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_PERSISTENT,















                    Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_SLEEP_MILLIS,

































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



+3
−0




























Original line number
Diff line number
Diff line








@@ -665,6 +665,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);

































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



+1
−0




























Original line number
Diff line number
Diff line








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















    }