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

Commit 8441bcbc authored by Peiyong Lin's avatar Peiyong Lin Committed by Yiwei Zhang
Browse files

Split blacklist from versioned blacklists. 

Previously we use blacklist to get all blacklists, to maintain the consistency
between blacklist and whitelist, and to move blacklist processing to GPU
service, we added blacklists to store all blacklists, and now blacklist will
only represent one blacklist.

BUG: 120869311
Test: Build, flash and boot. Verified in master patch ag/6288554
Change-Id: Ifac875177ad959705c8f80672341c4cbee7bbc93
Merged-In: Ifac875177ad959705c8f80672341c4cbee7bbc93
Exempt-From-Owner-Approval: Change in CoreSettingsObserver.java is too minor
parent b421e0c7

core/java/android/provider/Settings.java

+6 −0
Original line number Diff line number Diff line
@@ -11474,6 +11474,12 @@ public final class Settings { 
         */

        public static final String GAME_DRIVER_BLACKLIST = "game_driver_blacklist";













        /**













         * List of blacklists, each blacklist is a blacklist for a specific version of Game Driver.













         * @hide













         */













        public static final String GAME_DRIVER_BLACKLISTS = "game_driver_blacklists";



























        /**















         * Apps on the whitelist that are allowed to use Game Driver.















         * The string is a list of application package names, seperated by comma.

































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



+3
−0




























Original line number
Diff line number
Diff line








@@ -399,6 +399,9 @@ message GlobalSettingsProto {













        optional SettingProto game_driver_blacklist = 11;















        // Game Driver - List of Apps that are allowed to use Game Driver















        optional SettingProto game_driver_whitelist = 12;













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













        // a specific Game Driver version













        optional SettingProto game_driver_blacklists = 14;















    }















    optional Gpu gpu = 59;

















































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



+1
−0




























Original line number
Diff line number
Diff line








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













                    Settings.Global.GAME_DRIVER_ALL_APPS,















                    Settings.Global.GAME_DRIVER_OPT_IN_APPS,















                    Settings.Global.GAME_DRIVER_OPT_OUT_APPS,













                    Settings.Global.GAME_DRIVER_BLACKLISTS,















                    Settings.Global.GAME_DRIVER_BLACKLIST,















                    Settings.Global.GAME_DRIVER_WHITELIST,















                    Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING,

































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



+3
−0




























Original line number
Diff line number
Diff line








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













        dumpSetting(s, p,















                Settings.Global.GAME_DRIVER_WHITELIST,















                GlobalSettingsProto.Gpu.GAME_DRIVER_WHITELIST);













        dumpSetting(s, p,













                Settings.Global.GAME_DRIVER_BLACKLISTS,













                GlobalSettingsProto.Gpu.GAME_DRIVER_BLACKLISTS);















        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








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













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













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















        // add other global settings here...















    }