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

Commit bcda45e3 authored Aug 18, 2020 by TreeHugger Robot Committed by Android (Google) Code Review Aug 18, 2020

Merge "Add a SettingsProvider key for Adaptive connectivity"

parents 89746c9a 75651042

core/java/android/provider/Settings.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -9036,6 +9036,13 @@ public final class Settings {
		public static final String ACCESSIBILITY_MAGNIFICATION_CAPABILITY =
		"accessibility_magnification_capability";

		/**
		* Whether the Adaptive connectivity option is enabled.
		*
		* @hide
		*/
		public static final String ADAPTIVE_CONNECTIVITY_ENABLED = "adaptive_connectivity_enabled";

		/**
		* Keys we no longer back up under the current schema, but want to continue to
		* process when restoring historical backup datasets.

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -181,6 +181,7 @@ message SecureSettingsProto {
		optional SettingProto cmas_additional_broadcast_pkg = 14 [ (android.privacy).dest = DEST_AUTOMATIC ];
		repeated SettingProto completed_categories = 15;
		optional SettingProto connectivity_release_pending_intent_delay_ms = 16 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto adaptive_connectivity_enabled = 84 [ (android.privacy).dest = DEST_AUTOMATIC ];

		message Controls {
		option (android.msg_privacy).dest = DEST_EXPLICIT;
		@@ -614,5 +615,5 @@ message SecureSettingsProto {

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

packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -175,5 +175,6 @@ public class SecureSettings {
		Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED,
		Settings.Secure.PANIC_GESTURE_ENABLED,
		Settings.Secure.PANIC_SOUND_ENABLED,
		Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED
		};
		}

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -263,5 +263,6 @@ public class SecureSettingsValidators {
		VALIDATORS.put(Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.PANIC_GESTURE_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.PANIC_SOUND_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ADAPTIVE_CONNECTIVITY_ENABLED, BOOLEAN_VALIDATOR);
		}
		}

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -1976,6 +1976,9 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Settings.Secure.CONNECTIVITY_RELEASE_PENDING_INTENT_DELAY_MS,
		SecureSettingsProto.CONNECTIVITY_RELEASE_PENDING_INTENT_DELAY_MS);
		dumpSetting(s, p,
		Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED,
		SecureSettingsProto.ADAPTIVE_CONNECTIVITY_ENABLED);

		final long controlsToken = p.start(SecureSettingsProto.CONTROLS);
		dumpSetting(s, p,