Merge "Whitelist always-on setting" (9303f6fd) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -7090,6 +7090,8 @@ public final class Settings {
		*/
		public static final String DOZE_ALWAYS_ON = "doze_always_on";

		private static final Validator DOZE_ALWAYS_ON_VALIDATOR = BOOLEAN_VALIDATOR;

		/**
		* Whether the device should pulse on pick up gesture.
		* @hide
		@@ -8034,6 +8036,7 @@ public final class Settings {
		SYSTEM_NAVIGATION_KEYS_ENABLED,
		QS_TILES,
		DOZE_ENABLED,
		DOZE_ALWAYS_ON,
		DOZE_PULSE_ON_PICK_UP,
		DOZE_PULSE_ON_DOUBLE_TAP,
		NFC_PAYMENT_DEFAULT_COMPONENT,
		@@ -8172,6 +8175,7 @@ public final class Settings {
		SYSTEM_NAVIGATION_KEYS_ENABLED_VALIDATOR);
		VALIDATORS.put(QS_TILES, QS_TILES_VALIDATOR);
		VALIDATORS.put(DOZE_ENABLED, DOZE_ENABLED_VALIDATOR);
		VALIDATORS.put(DOZE_ALWAYS_ON, DOZE_ALWAYS_ON_VALIDATOR);
		VALIDATORS.put(DOZE_PULSE_ON_PICK_UP, DOZE_PULSE_ON_PICK_UP_VALIDATOR);
		VALIDATORS.put(DOZE_PULSE_ON_DOUBLE_TAP, DOZE_PULSE_ON_DOUBLE_TAP_VALIDATOR);
		VALIDATORS.put(NFC_PAYMENT_DEFAULT_COMPONENT, NFC_PAYMENT_DEFAULT_COMPONENT_VALIDATOR);

+0 −1

Original line number	Diff line number	Diff line
		@@ -536,7 +536,6 @@ public class SettingsBackupTest {
		Settings.Secure.DISABLED_PRINT_SERVICES,
		Settings.Secure.DISABLED_SYSTEM_INPUT_METHODS,
		Settings.Secure.DISPLAY_DENSITY_FORCED,
		Settings.Secure.DOZE_ALWAYS_ON,
		Settings.Secure.DOZE_PULSE_ON_LONG_PRESS,
		Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION,
		Settings.Secure.ENABLED_INPUT_METHODS, // Intentionally removed in P