Merge "[Audiosharing] Save broadcast data in SettingsProvider" into main (d92ce011) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+22 −0

Original line number	Diff line number	Diff line
		@@ -7318,6 +7318,28 @@ public final class Settings {
		public static final String BLUETOOTH_LE_BROADCAST_APP_SOURCE_NAME =
		"bluetooth_le_broadcast_app_source_name";

		/**
		* This is used by LocalBluetoothLeBroadcast to downgrade the broadcast quality to improve
		* compatibility.
		*
		* <ul>
		* <li>0 = false
		* <li>1 = true
		* </ul>
		*
		* @hide
		*/
		public static final String BLUETOOTH_LE_BROADCAST_IMPROVE_COMPATIBILITY =
		"bluetooth_le_broadcast_improve_compatibility";

		/**
		* This is used by LocalBluetoothLeBroadcast to store the fallback active device address.
		*
		* @hide
		*/
		public static final String BLUETOOTH_LE_BROADCAST_FALLBACK_ACTIVE_DEVICE_ADDRESS =
		"bluetooth_le_broadcast_fallback_active_device_address";

		/**
		* Ringtone routing value for hearing aid. It routes ringtone to hearing aid or device
		* speaker.

+2 −0

Original line number	Diff line number	Diff line
		@@ -241,6 +241,8 @@ public class SecureSettings {
		Settings.Secure.BLUETOOTH_LE_BROADCAST_PROGRAM_INFO,
		Settings.Secure.BLUETOOTH_LE_BROADCAST_CODE,
		Settings.Secure.BLUETOOTH_LE_BROADCAST_APP_SOURCE_NAME,
		Settings.Secure.BLUETOOTH_LE_BROADCAST_IMPROVE_COMPATIBILITY,
		Settings.Secure.BLUETOOTH_LE_BROADCAST_FALLBACK_ACTIVE_DEVICE_ADDRESS,
		Settings.Secure.CUSTOM_BUGREPORT_HANDLER_APP,
		Settings.Secure.CUSTOM_BUGREPORT_HANDLER_USER,
		Settings.Secure.LOCK_SCREEN_WEATHER_ENABLED,

+5 −0

Original line number	Diff line number	Diff line
		@@ -387,6 +387,11 @@ public class SecureSettingsValidators {
		VALIDATORS.put(Secure.BLUETOOTH_LE_BROADCAST_PROGRAM_INFO, ANY_STRING_VALIDATOR);
		VALIDATORS.put(Secure.BLUETOOTH_LE_BROADCAST_CODE, ANY_STRING_VALIDATOR);
		VALIDATORS.put(Secure.BLUETOOTH_LE_BROADCAST_APP_SOURCE_NAME, ANY_STRING_VALIDATOR);
		VALIDATORS.put(
		Secure.BLUETOOTH_LE_BROADCAST_IMPROVE_COMPATIBILITY,
		new DiscreteValueValidator(new String[] {"0", "1"}));
		VALIDATORS.put(
		Secure.BLUETOOTH_LE_BROADCAST_FALLBACK_ACTIVE_DEVICE_ADDRESS, ANY_STRING_VALIDATOR);
		VALIDATORS.put(Secure.CUSTOM_BUGREPORT_HANDLER_APP, ANY_STRING_VALIDATOR);
		VALIDATORS.put(Secure.CUSTOM_BUGREPORT_HANDLER_USER, ANY_INTEGER_VALIDATOR);
		VALIDATORS.put(Secure.LOCK_SCREEN_WEATHER_ENABLED, BOOLEAN_VALIDATOR);