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

Commit f00b8ca0 authored Jan 20, 2020 by Yogisha Dixit Committed by Android (Google) Code Review Jan 20, 2020

Merge "Add a new secure setting to disable doze."

parents 04ce5313 91009993

core/java/android/provider/Settings.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -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

core/proto/android/providers/settings/secure.proto

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -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,

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -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() {