Merge "Merge "Merge "Ims: Add SRVCC errorinfo""" (884e37cb) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/Connection.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ public abstract class Connection {
		public CallModify callModifyRequest = null;
		public String errorInfo;


		private static String LOG_TAG = "Connection";

		public enum DisconnectCause {
		@@ -80,6 +79,7 @@ public abstract class Connection {
		EMERGENCY_PERM_FAILURE, /* EMERGENCY call failed with permanent fail cause */
		ERROR_UNSPECIFIED,
		/* Ims Disconnect cause grouped from here */
		SRVCC_CALL_DROP, /* Call dropped because of SRVCC*/
		CALL_FAIL_MISC
		}

+151 −144

Original line number	Diff line number	Diff line
		@@ -91,6 +91,7 @@ public class WapPushOverSms implements ServiceConnection {

		if (DBG) Rlog.d(TAG, "Rx: " + IccUtils.bytesToHexString(pdu));

		try {
		int index = 0;
		int transactionId = pdu[index++] & 0xFF;
		int pduType = pdu[index++] & 0xFF;
		@@ -257,5 +258,11 @@ public class WapPushOverSms implements ServiceConnection {

		handler.dispatchIntent(intent, permission, appOp, receiver);
		return Activity.RESULT_OK;
		} catch (ArrayIndexOutOfBoundsException aie) {
		// 0-byte WAP PDU or other unexpected WAP PDU contents can easily throw this;
		// log exception string without stack trace and return false.
		Rlog.e(TAG, "ignoring dispatchWapPdu() array index exception: " + aie);
		return Intents.RESULT_SMS_GENERIC_ERROR;
		}
		}
		}