From: Matthew Fritze Date: Mon, 21 May 2018 21:42:36 +0000 (-0700) Subject: Add Settings Slice Whitelist key X-Git-Tag: android-x86-9.0-r1~104^2~18^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=640821bbc82549cc4f67397564397fdfbf6bcc46;p=android-x86%2Fframeworks-base.git Add Settings Slice Whitelist key Bug: 79779103 Test: None - only a flag. Change-Id: I764f2fddf05bf2b9df4e633c7f6c6c7e781c1149 Merged-In: I794159db4ff8aba7b6dcd91e13a984db40da47e7 --- diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index e9f7d2ae5697..45b851ff55e4 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -11564,6 +11564,13 @@ public final class Settings { /** @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. * diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index 5b7fc6efee95..d1b047bc3685 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -132,6 +132,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,