From 91009993e6ec1062e90fca30bb419da649994bb6 Mon Sep 17 00:00:00 2001 From: Yogisha Dixit Date: Tue, 14 Jan 2020 13:31:40 +0000 Subject: Add a new secure setting to disable doze. This secure setting doesn't need to be backed up because it represents a device state (e.g. airplane mode) and not a user-specified configuration. Test: SettingsTest, Settings_SecureTest, SettingsProviderTest Bug: 147584235 Change-Id: Ic89182297b095d128c63a4b422b4af2e3a63f3d3 --- core/java/android/provider/Settings.java | 6 ++++++ core/proto/android/providers/settings/secure.proto | 1 + .../src/com/android/providers/settings/SettingsProtoDumpUtil.java | 3 +++ .../test/src/android/provider/SettingsBackupTest.java | 3 ++- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 0e3dd3a8292a..b97482a30cc0 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -7597,6 +7597,12 @@ public final class Settings { */ public static final String DOZE_WAKE_DISPLAY_GESTURE = "doze_wake_display_gesture"; + /** + * Whether the device should suppress the current doze configuration and disable dozing. + * @hide + */ + public static final String SUPPRESS_DOZE = "suppress_doze"; + /** * Gesture that skips media. * @hide diff --git a/core/proto/android/providers/settings/secure.proto b/core/proto/android/providers/settings/secure.proto index 7835016439e0..77d4e87cec56 100644 --- a/core/proto/android/providers/settings/secure.proto +++ b/core/proto/android/providers/settings/secure.proto @@ -188,6 +188,7 @@ message SecureSettingsProto { optional SettingProto pulse_on_long_press = 4 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto pulse_on_double_tap = 5 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto pulse_on_tap = 6 [ (android.privacy).dest = DEST_AUTOMATIC ]; + optional SettingProto suppress = 7 [ (android.privacy).dest = DEST_AUTOMATIC ]; } optional Doze doze = 21; diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 449a135fa1c7..f6e5062039d2 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -1999,6 +1999,9 @@ class SettingsProtoDumpUtil { dumpSetting(s, p, Settings.Secure.DOZE_TAP_SCREEN_GESTURE, SecureSettingsProto.Doze.PULSE_ON_TAP); + dumpSetting(s, p, + Settings.Secure.SUPPRESS_DOZE, + SecureSettingsProto.Doze.SUPPRESS); p.end(dozeToken); dumpSetting(s, p, diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index a337570829e4..b896a2a8d9a4 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -726,7 +726,8 @@ public class SettingsBackupTest { Settings.Secure.FACE_UNLOCK_RE_ENROLL, Settings.Secure.TAP_GESTURE, Settings.Secure.WINDOW_MAGNIFICATION, - Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_MAGNIFICATION_CONTROLLER); + Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_MAGNIFICATION_CONTROLLER, + Settings.Secure.SUPPRESS_DOZE); @Test public void systemSettingsBackedUpOrBlacklisted() { -- cgit v1.2.3-59-g8ed1b