Merge "Rename the Settings key of HAC" into main (bdc78946) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -5961,13 +5961,12 @@ public final class Settings {
		public static final String DTMF_TONE_TYPE_WHEN_DIALING = "dtmf_tone_type";

		/**
		* Whether the hearing aid is enabled. The value is
		* boolean (1 or 0).
		* Whether the hearing aid compatibility is enabled. The value is boolean (1 or 0).
		* @hide
		*/
		@UnsupportedAppUsage
		@Readable
		public static final String HEARING_AID = "hearing_aid";
		public static final String HEARING_AID_COMPATIBILITY = "hearing_aid";

		/**
		* CDMA only settings
		@@ -6601,7 +6600,7 @@ public final class Settings {
		PRIVATE_SETTINGS.add(MEDIA_BUTTON_RECEIVER);
		PRIVATE_SETTINGS.add(HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY);
		PRIVATE_SETTINGS.add(DTMF_TONE_TYPE_WHEN_DIALING);
		PRIVATE_SETTINGS.add(HEARING_AID);
		PRIVATE_SETTINGS.add(HEARING_AID_COMPATIBILITY);
		PRIVATE_SETTINGS.add(TTY_MODE);
		PRIVATE_SETTINGS.add(NOTIFICATION_LIGHT_PULSE);
		PRIVATE_SETTINGS.add(POINTER_LOCATION);

+1 −1

Original line number	Diff line number	Diff line
		@@ -96,7 +96,7 @@ message SystemSettingsProto {
		optional HapticFeedback haptic_feedback = 12;

		// Whether the hearing aid is enabled. The value is boolean (1 or 0).
		optional SettingProto hearing_aid = 13 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto hearing_aid_compatibility = 13 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto lock_to_app_enabled = 14 [ (android.privacy).dest = DEST_AUTOMATIC ];

		message Lockscreen {

+1 −1

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ public class SystemSettings {
		Settings.System.TIME_12_24,
		Settings.System.DTMF_TONE_WHEN_DIALING,
		Settings.System.DTMF_TONE_TYPE_WHEN_DIALING,
		Settings.System.HEARING_AID,
		Settings.System.HEARING_AID_COMPATIBILITY,
		Settings.System.TTY_MODE,
		Settings.System.MASTER_MONO,
		Settings.System.MASTER_BALANCE,

+1 −1

Original line number	Diff line number	Diff line
		@@ -194,7 +194,7 @@ public class SystemSettingsValidators {
		VALIDATORS.put(System.HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY, BOOLEAN_VALIDATOR);
		VALIDATORS.put(System.VIBRATE_WHEN_RINGING, BOOLEAN_VALIDATOR);
		VALIDATORS.put(System.DTMF_TONE_TYPE_WHEN_DIALING, BOOLEAN_VALIDATOR);
		VALIDATORS.put(System.HEARING_AID, BOOLEAN_VALIDATOR);
		VALIDATORS.put(System.HEARING_AID_COMPATIBILITY, BOOLEAN_VALIDATOR);
		VALIDATORS.put(System.TTY_MODE, new InclusiveIntegerRangeValidator(0, 3));
		VALIDATORS.put(System.NOTIFICATION_LIGHT_PULSE, BOOLEAN_VALIDATOR);
		VALIDATORS.put(System.POINTER_LOCATION, BOOLEAN_VALIDATOR);

+1 −1

Original line number	Diff line number	Diff line
		@@ -2106,7 +2106,7 @@ class DatabaseHelper extends SQLiteOpenHelper {
		loadSetting(stmt, Settings.System.DTMF_TONE_TYPE_WHEN_DIALING, 0);

		// Set default hearing aid
		loadSetting(stmt, Settings.System.HEARING_AID, 0);
		loadSetting(stmt, Settings.System.HEARING_AID_COMPATIBILITY, 0);

		// Set default tty mode
		loadSetting(stmt, Settings.System.TTY_MODE, 0);