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

Commit 9a326384 authored by Matthew Fritze's avatar Matthew Fritze Committed by android-build-merger
Browse files

Merge "Add Settings Slice Whitelist key" into pi-dev 

am: 1561bb41

Change-Id: Ic0843740958ff9e191f98220c3a80bf29a5e8251
parents 3ab443b1 1561bb41

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -11602,6 +11602,13 @@ public final class Settings { 
        /** @hide */ public static final int EMULATE_DISPLAY_CUTOUT_OFF = 0;

        /** @hide */ public static final int EMULATE_DISPLAY_CUTOUT_ON = 1;













        /**













         * A colon separated list of keys for Settings Slices.













         *













         * @hide













         */













        public static final String BLOCKED_SLICES = "blocked_slices";



























        /**















         * Defines global zen mode.  ZEN_MODE_OFF, ZEN_MODE_IMPORTANT_INTERRUPTIONS,















         * or ZEN_MODE_NO_INTERRUPTIONS.

































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



+1
−0




























Original line number
Diff line number
Diff line








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













                    Settings.Global.BLE_SCAN_LOW_LATENCY_WINDOW_MS,















                    Settings.Global.BLE_SCAN_LOW_LATENCY_INTERVAL_MS,















                    Settings.Global.BLE_SCAN_BACKGROUND_MODE,













                    Settings.Global.BLOCKED_SLICES,















                    Settings.Global.BLOCKING_HELPER_DISMISS_TO_VIEW_RATIO_LIMIT,















                    Settings.Global.BLOCKING_HELPER_STREAK_LIMIT,















                    Settings.Global.BLUETOOTH_A2DP_SINK_PRIORITY_PREFIX,