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

Commit 3b746758 authored Dec 09, 2022 by Yifei Zhang Committed by Josh Yang Feb 23, 2023

settings: create DISABLE_AOD_WHILE_PLUGGED

- 0 = disable AOD while plugged
- 1 = allow AOD while plugged

Test: manual
Bug: 262270741
Bug: 241172900

Change-Id: Ia326919facc2499284119d3c2fee7dce63e282c9
(cherry picked from commit 26076c1891e45144f7e4c174e55bcdeb6fc914d1)

parent 369f3f63

core/java/android/provider/Settings.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -18487,6 +18487,13 @@ public final class Settings {
		* @hide
		*/
		public static final int UPGRADE_DATA_MIGRATION_DONE = 2;

		/**
		* Whether to disable AOD while plugged.
		* (0 = false, 1 = true)
		* @hide
		*/
		public static final String DISABLE_AOD_WHILE_PLUGGED = "disable_aod_while_plugged";
		}
		}

packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -410,5 +410,6 @@ public class GlobalSettingsValidators {
		String.valueOf(Global.Wearable.UPGRADE_DATA_MIGRATION_PENDING),
		String.valueOf(Global.Wearable.UPGRADE_DATA_MIGRATION_DONE)
		}));
		VALIDATORS.put(Global.Wearable.DISABLE_AOD_WHILE_PLUGGED, BOOLEAN_VALIDATOR);
		}
		}

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -665,7 +665,8 @@ public class SettingsBackupTest {
		Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_ENABLED,
		Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_TYPE,
		Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_SPEED,
		Settings.Global.Wearable.SCREENSHOT_ENABLED);
		Settings.Global.Wearable.SCREENSHOT_ENABLED,
		Settings.Global.Wearable.DISABLE_AOD_WHILE_PLUGGED);

		private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =
		newHashSet(