Merge "Fix In Conference MMI codes" (04d4dd51) · Commits · e / os / android_frameworks_opt_telephony

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -1259,7 +1259,7 @@ public class GsmCdmaCallTracker extends CallTracker {
		int count = call.mConnections.size();
		for (int i = 0; i < count; i++) {
		GsmCdmaConnection cn = (GsmCdmaConnection)call.mConnections.get(i);
		if (cn.getGsmCdmaIndex() == index) {
		if (!cn.mDisconnected && cn.getGsmCdmaIndex() == index) {
		mCi.hangupConnection(index, obtainCompleteMessage());
		return;
		}
		@@ -1273,8 +1273,10 @@ public class GsmCdmaCallTracker extends CallTracker {
		int count = call.mConnections.size();
		for (int i = 0; i < count; i++) {
		GsmCdmaConnection cn = (GsmCdmaConnection)call.mConnections.get(i);
		if (!cn.mDisconnected) {
		mCi.hangupConnection(cn.getGsmCdmaIndex(), obtainCompleteMessage());
		}
		}
		} catch (CallStateException ex) {
		Rlog.e(LOG_TAG, "hangupConnectionByIndex caught " + ex);
		}
		@@ -1285,7 +1287,7 @@ public class GsmCdmaCallTracker extends CallTracker {
		int count = call.mConnections.size();
		for (int i = 0; i < count; i++) {
		GsmCdmaConnection cn = (GsmCdmaConnection)call.mConnections.get(i);
		if (cn.getGsmCdmaIndex() == index) {
		if (!cn.mDisconnected && cn.getGsmCdmaIndex() == index) {
		return cn;
		}
		}