Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-22 23:40:24 +00:00
committed by Android (Google) Code Review
parent 330713b381 640821bbc8
commit 1561bb41bd
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/provider/Settings.java
View File

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

1
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -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,