Merge "Make SATELLITE_ENABLED and EVENT_DISPLAY_SOS_MESSAGE public." into main (d84bafaa) · Commits · e / os / android_frameworks_base

core/api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -44883,6 +44883,7 @@ package android.telephony {
		field public static final int OUT_OF_NETWORK = 11; // 0xb
		field public static final int OUT_OF_SERVICE = 18; // 0x12
		field public static final int POWER_OFF = 17; // 0x11
		field public static final int SATELLITE_ENABLED = 82; // 0x52
		field public static final int SERVER_ERROR = 12; // 0xc
		field public static final int SERVER_UNREACHABLE = 9; // 0x9
		field public static final int TIMED_OUT = 13; // 0xd
		@@ -46007,6 +46008,7 @@ package android.telephony {
		field public static final int ERI_FLASH = 2; // 0x2
		field public static final int ERI_OFF = 1; // 0x1
		field public static final int ERI_ON = 0; // 0x0
		field public static final String EVENT_DISPLAY_SOS_MESSAGE = "android.telephony.event.DISPLAY_SOS_MESSAGE";
		field public static final String EXTRA_ACTIVE_SIM_SUPPORTED_COUNT = "android.telephony.extra.ACTIVE_SIM_SUPPORTED_COUNT";
		field public static final String EXTRA_APN_PROTOCOL = "android.telephony.extra.APN_PROTOCOL";
		field public static final String EXTRA_APN_TYPE = "android.telephony.extra.APN_TYPE";

+0 −12

Original line number	Diff line number	Diff line
		@@ -360,18 +360,6 @@ public final class Call {
		public static final String EXTRA_DIAGNOSTIC_MESSAGE =
		"android.telecom.extra.DIAGNOSTIC_MESSAGE";

		/**
		* Event reported from the Telecom stack to indicate that the {@link Connection} is not able to
		* find any network and likely will not get connected. Upon receiving this event, the dialer
		* app should show satellite SOS button if satellite is provisioned.
		* <p>
		* The dialer app receives this event via
		* {@link Call.Callback#onConnectionEvent(Call, String, Bundle)}.
		* @hide
		*/
		public static final String EVENT_DISPLAY_SOS_MESSAGE =
		"android.telecom.event.DISPLAY_SOS_MESSAGE";

		/**
		* Reject reason used with {@link #reject(int)} to indicate that the user is rejecting this
		* call because they have declined to answer it. This typically means that they are unable

+0 −1

Original line number	Diff line number	Diff line
		@@ -362,7 +362,6 @@ public final class DisconnectCause {

		/**
		* Indicates that the call was unable to be made because the satellite modem is enabled.
		* @hide
		*/
		public static final int SATELLITE_ENABLED = 82;

+13 −0

Original line number	Diff line number	Diff line
		@@ -76,7 +76,9 @@ import android.provider.Settings.SettingNotFoundException;
		import android.service.carrier.CarrierIdentifier;
		import android.service.carrier.CarrierService;
		import android.sysprop.TelephonyProperties;
		import android.telecom.Call;
		import android.telecom.CallScreeningService;
		import android.telecom.Connection;
		import android.telecom.InCallService;
		import android.telecom.PhoneAccount;
		import android.telecom.PhoneAccountHandle;
		@@ -1185,6 +1187,17 @@ public class TelephonyManager {
		public static final String EVENT_SUPPLEMENTARY_SERVICE_NOTIFICATION =
		"android.telephony.event.EVENT_SUPPLEMENTARY_SERVICE_NOTIFICATION";

		/**
		* Event reported from the Telephony stack to indicate that the {@link Connection} is not
		* able to find any network and likely will not get connected. Upon receiving this event,
		* the dialer app should show satellite SOS button if satellite is provisioned.
		* <p>
		* The dialer app receives this event via
		* {@link Call.Callback#onConnectionEvent(Call, String, Bundle)}.
		*/
		public static final String EVENT_DISPLAY_SOS_MESSAGE =
		"android.telephony.event.DISPLAY_SOS_MESSAGE";

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