am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread (88b4bd5f) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/CallManager.java

+30 −16

Original line number	Diff line number	Diff line
		@@ -1468,13 +1468,27 @@ public final class CallManager {
		*
		*/
		public Call getActiveFgCall() {
		for (Call call : mForegroundCalls) {
		if (call.getState() != Call.State.IDLE) {
		Call call = getFirstNonIdleCall(mForegroundCalls);
		if (call == null) {
		call = (mDefaultPhone == null)
		? null
		: mDefaultPhone.getForegroundCall();
		}
		return call;
		}

		// Returns the first call that is not in IDLE state. If both active calls
		// and disconnecting/disconnected calls exist, return the first active call.
		private Call getFirstNonIdleCall(List<Call> calls) {
		Call result = null;
		for (Call call : calls) {
		if (!call.isIdle()) {
		return call;
		} else if (call.getState() != Call.State.IDLE) {
		if (result == null) result = call;
		}
		}
		return (mDefaultPhone == null) ?
		null : mDefaultPhone.getForegroundCall();
		return result;
		}

		/**
		@@ -1491,13 +1505,13 @@ public final class CallManager {
		* Complete background calls list can be get by getBackgroundCalls()
		*/
		public Call getFirstActiveBgCall() {
		for (Call call : mBackgroundCalls) {
		if (call.getState() != Call.State.IDLE) {
		return call;
		}
		Call call = getFirstNonIdleCall(mBackgroundCalls);
		if (call == null) {
		call = (mDefaultPhone == null)
		? null
		: mDefaultPhone.getBackgroundCall();
		}
		return (mDefaultPhone == null) ?
		null : mDefaultPhone.getBackgroundCall();
		return call;
		}

		/**
		@@ -1514,13 +1528,13 @@ public final class CallManager {
		* Complete ringing calls list can be get by getRingingCalls()
		*/
		public Call getFirstActiveRingingCall() {
		for (Call call : mRingingCalls) {
		if (!call.isIdle()) {
		return call;
		}
		Call call = getFirstNonIdleCall(mRingingCalls);
		if (call == null) {
		call = (mDefaultPhone == null)
		? null
		: mDefaultPhone.getRingingCall();
		}
		return (mDefaultPhone == null) ?
		null : mDefaultPhone.getRingingCall();
		return call;
		}

		/**

telephony/java/com/android/internal/telephony/sip/SipPhone.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -807,7 +807,10 @@ public class SipPhone extends SipPhoneBase {
		} catch (SipException e) {
		throw new CallStateException("hangup(): " + e);
		} finally {
		mAdapter.onCallEnded(DisconnectCause.LOCAL);
		mAdapter.onCallEnded(((mState == Call.State.INCOMING)
		\|\| (mState == Call.State.WAITING))
		? DisconnectCause.INCOMING_REJECTED
		: DisconnectCause.LOCAL);
		}
		}
		}