Merge "Adding a SIM slot index for setting emergency satellite handover type." into main (766af1f7) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -1265,6 +1265,18 @@ public class TelephonyManager {
		public static final String EXTRA_EMERGENCY_CALL_TO_SATELLITE_LAUNCH_INTENT =
		"android.telephony.extra.EMERGENCY_CALL_TO_SATELLITE_LAUNCH_INTENT";

		/**
		* Integer extra key used with the {@link #EVENT_DISPLAY_EMERGENCY_MESSAGE} for a
		* {@link PendingIntent} which will be launched by the Dialer app. This extra key is included
		* the in {@link Intent} of the {@link PendingIntent} only when the handover type is
		* {@link SatelliteManager#EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_T911}.
		*
		* <p> This extra key indicates the SIM slot ID of the satellite subscription that is used
		* to launch the T911 conversation thread in the messaging app.
		* @hide
		*/
		public static final String EXTRA_SIM_SLOT_ID = "simSlot";

		/**
		* Integer extra key used with {@link #EVENT_SUPPLEMENTARY_SERVICE_NOTIFICATION} which indicates
		* the type of supplementary service notification which occurred.

+3 −1

Original line number	Diff line number	Diff line
		@@ -3195,9 +3195,11 @@ interface ITelephony {
		* 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.
		* @param simSlotIndex The SIM slot index to use for loading T911 conversation thread.
		* @return {@code true} if the handover type is set successfully, {@code false} otherwise.
		*/
		boolean setEmergencyCallToSatelliteHandoverType(int handoverType, int delaySeconds);
		boolean setEmergencyCallToSatelliteHandoverType(
		int handoverType, int delaySeconds, int simSlotIndex);

		/**
		* This API should be used by only CTS tests to forcefully set the country codes.