Merge "Update javadoc for APIs related to SOS recommender" into main (8aac9ff0) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+12 −6

Original line number	Diff line number	Diff line
		@@ -9577,14 +9577,20 @@ public class CarrierConfigManager {
		"satellite_attach_supported_bool";

		/**
		* The carrier-enabled satellite connection hysteresis time in seconds to determine whether to
		* recommend Dialer to prompt users to use satellite emergency messaging.
		* The carrier-enabled satellite connection hysteresis time in seconds for which the device
		* continues in satellite mode after it loses the connection with the satellite network.
		* <p>
		* A timer is started when there is an ongoing emergency call, and the IMS is not registered,
		* and cellular service is not available, and the device was connected to a satellite network
		* within this time in the past. When the timer expires, Telephony will send the event
		* If the device is in satellite mode, the following actions will be taken by the device:
		* <ul>
		* <li>System UI will continue showing the satellite icon.</li>
		* <li>When there is an ongoing emergency call, and the IMS is not registered, and cellular
		* service is not available, and the device is in satellite mode, a timer with a duration
		* defined by the overlay config
		* {@code config_emergency_call_wait_for_connection_timeout_millis} will be started. When the
		* timer expires, Telephony will send the event
		* {@link TelephonyManager#EVENT_DISPLAY_EMERGENCY_MESSAGE} to Dialer, which will then prompt
		* users to switch to using satellite emergency messaging.
		* users to switch to using satellite emergency messaging.</li>
		* </ul>
		* <p>
		* The default value is 300 seconds.
		*/

telephony/java/android/telephony/TelephonyManager.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1207,7 +1207,8 @@ public class TelephonyManager {
		* The dialer app receives this event via
		* {@link Call.Callback#onConnectionEvent(Call, String, Bundle)}.
		* <p>
		* The {@link Bundle} parameter is expected to include the following extras:
		* The {@link Bundle} parameter is guaranteed to include the following extras if the below
		* conditions are met:
		* <ul>
		* <li>{@link #EXTRA_EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE} - the recommending handover
		* type.</li>

telephony/java/com/android/internal/telephony/ITelephony.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -3045,8 +3045,8 @@ interface ITelephony {
		*
		* @param handoverType The type of handover from emergency call to satellite messaging. Use one
		* of the following values to enable the override:
		* 0 - EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_SOS
		* 1 - EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_T911
		* 1 - EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_SOS
		* 2 - EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_T911
		* To disable the override, use -1 for handoverType.
		* @param delaySeconds The event EVENT_DISPLAY_EMERGENCY_MESSAGE will be sent to Dialer
		* delaySeconds after the emergency call starts.