Merge "Move RTT system setting to Settings.Secure" into pi-dev (fe85e458) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -36684,6 +36684,7 @@ package android.provider {
		field public static final java.lang.String PARENTAL_CONTROL_ENABLED = "parental_control_enabled";
		field public static final java.lang.String PARENTAL_CONTROL_LAST_UPDATE = "parental_control_last_update";
		field public static final java.lang.String PARENTAL_CONTROL_REDIRECT_URL = "parental_control_redirect_url";
		field public static final java.lang.String RTT_CALLING_MODE = "rtt_calling_mode";
		field public static final java.lang.String SELECTED_INPUT_METHOD_SUBTYPE = "selected_input_method_subtype";
		field public static final java.lang.String SETTINGS_CLASSNAME = "settings_classname";
		field public static final java.lang.String SKIP_FIRST_USE_HINTS = "skip_first_use_hints";
		@@ -36789,7 +36790,6 @@ package android.provider {
		field public static final deprecated java.lang.String RADIO_NFC = "nfc";
		field public static final deprecated java.lang.String RADIO_WIFI = "wifi";
		field public static final java.lang.String RINGTONE = "ringtone";
		field public static final java.lang.String RTT_CALLING_MODE = "rtt_calling_mode";
		field public static final java.lang.String SCREEN_BRIGHTNESS = "screen_brightness";
		field public static final java.lang.String SCREEN_BRIGHTNESS_MODE = "screen_brightness_mode";
		field public static final int SCREEN_BRIGHTNESS_MODE_AUTOMATIC = 1; // 0x1

core/java/android/provider/Settings.java

+13 −13

Original line number	Diff line number	Diff line
		@@ -3752,17 +3752,6 @@ public final class Settings {
		public static final Validator TTY_MODE_VALIDATOR =
		new SettingsValidators.InclusiveIntegerRangeValidator(0, 3);

		/**
		* User-selected RTT mode. When on, outgoing and incoming calls will be answered as RTT
		* calls when supported by the device and carrier. Boolean value.
		* 0 = OFF
		* 1 = ON
		*/
		public static final String RTT_CALLING_MODE = "rtt_calling_mode";

		/** @hide */
		public static final Validator RTT_CALLING_MODE_VALIDATOR = BOOLEAN_VALIDATOR;

		/**
		* Whether the sounds effects (key clicks, lid open ...) are enabled. The value is
		* boolean (1 or 0).
		@@ -4088,7 +4077,6 @@ public final class Settings {
		DTMF_TONE_WHEN_DIALING,
		DTMF_TONE_TYPE_WHEN_DIALING,
		HEARING_AID,
		RTT_CALLING_MODE,
		TTY_MODE,
		MASTER_MONO,
		SOUND_EFFECTS_ENABLED,
		@@ -4287,7 +4275,6 @@ public final class Settings {
		VALIDATORS.put(DTMF_TONE_TYPE_WHEN_DIALING, DTMF_TONE_TYPE_WHEN_DIALING_VALIDATOR);
		VALIDATORS.put(HEARING_AID, HEARING_AID_VALIDATOR);
		VALIDATORS.put(TTY_MODE, TTY_MODE_VALIDATOR);
		VALIDATORS.put(RTT_CALLING_MODE, RTT_CALLING_MODE_VALIDATOR);
		VALIDATORS.put(NOTIFICATION_LIGHT_PULSE, NOTIFICATION_LIGHT_PULSE_VALIDATOR);
		VALIDATORS.put(POINTER_LOCATION, POINTER_LOCATION_VALIDATOR);
		VALIDATORS.put(SHOW_TOUCHES, SHOW_TOUCHES_VALIDATOR);
		@@ -6659,6 +6646,17 @@ public final class Settings {

		private static final Validator TTY_MODE_ENABLED_VALIDATOR = BOOLEAN_VALIDATOR;

		/**
		* User-selected RTT mode. When on, outgoing and incoming calls will be answered as RTT
		* calls when supported by the device and carrier. Boolean value.
		* 0 = OFF
		* 1 = ON
		*/
		public static final String RTT_CALLING_MODE = "rtt_calling_mode";

		private static final Validator RTT_CALLING_MODE_VALIDATOR = BOOLEAN_VALIDATOR;

		/**
		/**
		* Controls whether settings backup is enabled.
		* Type: int ( 0 = disabled, 1 = enabled )
		@@ -7885,6 +7883,7 @@ public final class Settings {
		PREFERRED_TTY_MODE,
		ENHANCED_VOICE_PRIVACY_ENABLED,
		TTY_MODE_ENABLED,
		RTT_CALLING_MODE,
		INCALL_POWER_BUTTON_BEHAVIOR,
		NIGHT_DISPLAY_CUSTOM_START_TIME,
		NIGHT_DISPLAY_CUSTOM_END_TIME,
		@@ -8014,6 +8013,7 @@ public final class Settings {
		VALIDATORS.put(ENHANCED_VOICE_PRIVACY_ENABLED,
		ENHANCED_VOICE_PRIVACY_ENABLED_VALIDATOR);
		VALIDATORS.put(TTY_MODE_ENABLED, TTY_MODE_ENABLED_VALIDATOR);
		VALIDATORS.put(RTT_CALLING_MODE, RTT_CALLING_MODE_VALIDATOR);
		VALIDATORS.put(INCALL_POWER_BUTTON_BEHAVIOR, INCALL_POWER_BUTTON_BEHAVIOR_VALIDATOR);
		VALIDATORS.put(NIGHT_DISPLAY_CUSTOM_START_TIME,
		NIGHT_DISPLAY_CUSTOM_START_TIME_VALIDATOR);

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -340,6 +340,11 @@ message SecureSettingsProto {
		}
		optional Rotation rotation = 46;

		// User-selected RTT mode. When on, outgoing and incoming calls will be
		// answered as RTT calls when supported by the device and carrier. Boolean
		// value.
		optional SettingProto rtt_calling_mode = 69 [ (android.privacy).dest = DEST_AUTOMATIC ];

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

		@@ -474,5 +479,5 @@ message SecureSettingsProto {

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

core/proto/android/providers/settings/system.proto

+1 −4

Original line number	Diff line number	Diff line
		@@ -151,10 +151,7 @@ message SystemSettingsProto {
		}
		optional Rotation rotation = 20;

		// User-selected RTT mode. When on, outgoing and incoming calls will be
		// answered as RTT calls when supported by the device and carrier. Boolean
		// value.
		optional SettingProto rtt_calling_mode = 21 [ (android.privacy).dest = DEST_AUTOMATIC ];
		reserved 21; // rtt_calling_mode moved to Settings.Secure

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

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -2019,6 +2019,10 @@ class SettingsProtoDumpUtil {
		SecureSettingsProto.Rotation.NUM_ROTATION_SUGGESTIONS_ACCEPTED);
		p.end(rotationToken);

		dumpSetting(s, p,
		Settings.Secure.RTT_CALLING_MODE,
		SecureSettingsProto.RTT_CALLING_MODE);

		final long screensaverToken = p.start(SecureSettingsProto.SCREENSAVER);
		dumpSetting(s, p,
		Settings.Secure.SCREENSAVER_ENABLED,
		@@ -2402,10 +2406,6 @@ class SettingsProtoDumpUtil {
		SystemSettingsProto.Rotation.HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY);
		p.end(rotationToken);

		dumpSetting(s, p,
		Settings.System.RTT_CALLING_MODE,
		SystemSettingsProto.RTT_CALLING_MODE);

		final long screenToken = p.start(SystemSettingsProto.SCREEN);
		dumpSetting(s, p,
		Settings.System.SCREEN_OFF_TIMEOUT,