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

Commit 79822242 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Split blacklist from versioned blacklists."

parents b70f4b51 075a9e83

core/java/android/provider/Settings.java

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








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













        optional SettingProto game_driver_whitelist = 12;















        // ANGLE - List of Apps that can check ANGLE rules















        optional SettingProto angle_whitelist = 13;













        // 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








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

































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



+3
−0




























Original line number
Diff line number
Diff line








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








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















    }