Merge "Fix In Conference MMI codes" (6ee00440) · Commits · e / os / android_frameworks_opt_telephony

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

+8 −6

Original line number	Original line	Diff line number	Diff line
	@@ -30,13 +30,12 @@ import android.os.SystemProperties;
	import android.telephony.CellLocation;		import android.telephony.CellLocation;
	import android.telephony.DisconnectCause;		import android.telephony.DisconnectCause;
	import android.telephony.PhoneNumberUtils;		import android.telephony.PhoneNumberUtils;
			import android.telephony.Rlog;
	import android.telephony.ServiceState;		import android.telephony.ServiceState;
	import android.telephony.TelephonyManager;		import android.telephony.TelephonyManager;
	import android.telephony.cdma.CdmaCellLocation;		import android.telephony.cdma.CdmaCellLocation;
	import android.telephony.gsm.GsmCellLocation;		import android.telephony.gsm.GsmCellLocation;
	import android.text.TextUtils;		import android.text.TextUtils;
	import java.util.Iterator;
	import android.telephony.Rlog;
	import android.util.EventLog;		import android.util.EventLog;

	import com.android.internal.telephony.cdma.CdmaCallWaitingNotification;		import com.android.internal.telephony.cdma.CdmaCallWaitingNotification;
	@@ -44,8 +43,9 @@ import com.android.internal.telephony.metrics.TelephonyMetrics;

	import java.io.FileDescriptor;		import java.io.FileDescriptor;
	import java.io.PrintWriter;		import java.io.PrintWriter;
	import java.util.List;
	import java.util.ArrayList;		import java.util.ArrayList;
			import java.util.Iterator;
			import java.util.List;

	/**		/**
	* {@hide}		* {@hide}
	@@ -1249,7 +1249,7 @@ public class GsmCdmaCallTracker extends CallTracker {
	int count = call.mConnections.size();		int count = call.mConnections.size();
	for (int i = 0; i < count; i++) {		for (int i = 0; i < count; i++) {
	GsmCdmaConnection cn = (GsmCdmaConnection)call.mConnections.get(i);		GsmCdmaConnection cn = (GsmCdmaConnection)call.mConnections.get(i);
	if (cn.getGsmCdmaIndex() == index) {		if (!cn.mDisconnected && cn.getGsmCdmaIndex() == index) {
	mCi.hangupConnection(index, obtainCompleteMessage());		mCi.hangupConnection(index, obtainCompleteMessage());
	return;		return;
	}		}
	@@ -1263,8 +1263,10 @@ public class GsmCdmaCallTracker extends CallTracker {
	int count = call.mConnections.size();		int count = call.mConnections.size();
	for (int i = 0; i < count; i++) {		for (int i = 0; i < count; i++) {
	GsmCdmaConnection cn = (GsmCdmaConnection)call.mConnections.get(i);		GsmCdmaConnection cn = (GsmCdmaConnection)call.mConnections.get(i);
			if (!cn.mDisconnected) {
	mCi.hangupConnection(cn.getGsmCdmaIndex(), obtainCompleteMessage());		mCi.hangupConnection(cn.getGsmCdmaIndex(), obtainCompleteMessage());
	}		}
			}
	} catch (CallStateException ex) {		} catch (CallStateException ex) {
	Rlog.e(LOG_TAG, "hangupConnectionByIndex caught " + ex);		Rlog.e(LOG_TAG, "hangupConnectionByIndex caught " + ex);
	}		}
	@@ -1275,7 +1277,7 @@ public class GsmCdmaCallTracker extends CallTracker {
	int count = call.mConnections.size();		int count = call.mConnections.size();
	for (int i = 0; i < count; i++) {		for (int i = 0; i < count; i++) {
	GsmCdmaConnection cn = (GsmCdmaConnection)call.mConnections.get(i);		GsmCdmaConnection cn = (GsmCdmaConnection)call.mConnections.get(i);
	if (cn.getGsmCdmaIndex() == index) {		if (!cn.mDisconnected && cn.getGsmCdmaIndex() == index) {
	return cn;		return cn;
	}		}
	}		}