Merge "Add a Settings.Secure value to store extra battery saver schedule" into tm-qpr-dev (1dc27fa1) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -10879,6 +10879,14 @@ public final class Settings {
		*/
		public static final String ADAPTIVE_CHARGING_ENABLED = "adaptive_charging_enabled";

		/**
		* Whether battery saver is currently set to different schedule mode.
		*
		* @hide
		*/
		public static final String EXTRA_AUTOMATIC_POWER_SAVE_MODE =
		"extra_automatic_power_save_mode";

		/**
		* These entries are considered common between the personal and the managed profile,
		* since the managed profile doesn't get to change them.

+8 −1

Original line number	Diff line number	Diff line
		@@ -473,6 +473,13 @@ message SecureSettingsProto {
		}
		optional PowerMenuPrivacy power_menu_privacy = 81;

		message ExtraLowPowerMode {
		option (android.msg_privacy).dest = DEST_EXPLICIT;

		optional SettingProto extra_automatic_power_save_mode = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
		}
		optional ExtraLowPowerMode extra_low_power_mode = 93;

		message PrintService {
		option (android.msg_privacy).dest = DEST_EXPLICIT;

		@@ -679,5 +686,5 @@ message SecureSettingsProto {

		// Please insert fields in alphabetical order and group them into messages
		// if possible (to avoid reaching the method limit).
		// Next tag = 93;
		// Next tag = 94;
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -2358,6 +2358,12 @@ class SettingsProtoDumpUtil {
		SecureSettingsProto.PowerMenuPrivacy.SHOW);
		p.end(powerMenuPrivacyToken);

		final long extraLowPowerModeToken = p.start(SecureSettingsProto.EXTRA_LOW_POWER_MODE);
		dumpSetting(s, p,
		Settings.Secure.EXTRA_AUTOMATIC_POWER_SAVE_MODE,
		SecureSettingsProto.ExtraLowPowerMode.EXTRA_AUTOMATIC_POWER_SAVE_MODE);
		p.end(extraLowPowerModeToken);

		final long printServiceToken = p.start(SecureSettingsProto.PRINT_SERVICE);
		dumpSetting(s, p,
		Settings.Secure.PRINT_SERVICE_SEARCH_URI,