resolve merge conflicts of d04c51ea372a to nyc-mr2-dev-plus-aosp (58197551) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -1099,6 +1099,9 @@ public class CarrierConfigManager {
		* and {@code NEW_CODE} is the new {@code ImsReasonInfo#CODE_*} which this combination of
		* original code and message shall be remapped to.
		*
		* Note: If {@code *} is specified for the original code, any ImsReasonInfo with the matching
		* {@code MESSAGE} will be remapped to {@code NEW_CODE}.
		*
		* Example: "501\|call completion elsewhere\|1014"
		* When the {@link ImsReasonInfo#getCode()} is {@link ImsReasonInfo#CODE_USER_TERMINATED} and
		* the {@link ImsReasonInfo#getExtraMessage()} is {@code "call completion elsewhere"},

telephony/java/android/telephony/DisconnectCause.java

+10 −13

Original line number	Diff line number	Diff line
		@@ -247,23 +247,18 @@ public class DisconnectCause {
		*/
		public static final int IMEI_NOT_ACCEPTED = 58;

		/**
		* A call over WIFI was disconnected because the WIFI signal was lost or became too degraded to
		* continue the call.
		*/
		public static final int WIFI_LOST = 59;

		//*********************************************************************************************
		// When adding a disconnect type:
		// 1) Please assign the new type the next id value below.
		// 2) Increment the next id value below to a new value.
		// 3) Update MAXIMUM_VALID_VALUE to the new disconnect type.
		// 4) Update toString() with the newly added disconnect type.
		// 5) Update android.telecom.DisconnectCauseUtil with any mappings to a telecom.DisconnectCause.
		//
		// NextId: 59
		// 1) Update toString() with the newly added disconnect type.
		// 2) Update android.telecom.DisconnectCauseUtil with any mappings to a telecom.DisconnectCause.
		//*********************************************************************************************

		/** Smallest valid value for call disconnect codes. */
		public static final int MINIMUM_VALID_VALUE = NOT_DISCONNECTED;

		/** Largest valid value for call disconnect codes. */
		public static final int MAXIMUM_VALID_VALUE = IMEI_NOT_ACCEPTED;

		/** Private constructor to avoid class instantiation. */
		private DisconnectCause() {
		// Do nothing.
		@@ -388,6 +383,8 @@ public class DisconnectCause {
		return "DIALED_CALL_FORWARDING_WHILE_ROAMING";
		case IMEI_NOT_ACCEPTED:
		return "IMEI_NOT_ACCEPTED";
		case WIFI_LOST:
		return "WIFI_LOST";
		default:
		return "INVALID: " + cause;
		}

telephony/java/com/android/ims/ImsReasonInfo.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -307,6 +307,11 @@ public class ImsReasonInfo implements Parcelable {
		*/
		public static final int CODE_DATA_DISABLED = 1406;

		/**
		* Indicates a call was disconnected due to loss of wifi signal.
		*/
		public static final int CODE_WIFI_LOST = 1407;

		/**
		* Network string error messages.
		* mExtraMessage may have these values.