Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 604a90f5 authored Oct 20, 2014 by Yorke Lee

Update call capabilities when call is removed

Bug: 18018700
Bug: 17586196
Change-Id: I4bb733fea421e4c18378f0ff96b571e6b2f66a14

parent 127faa82

src/com/android/server/telecom/Call.java

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -557,8 +557,12 @@ final class Call implements CreateConnectionResponse {
	}		}

	void setCallCapabilities(int callCapabilities) {		void setCallCapabilities(int callCapabilities) {
			setCallCapabilities(callCapabilities, false /* forceUpdate */);
			}

			void setCallCapabilities(int callCapabilities, boolean forceUpdate) {
	Log.v(this, "setCallCapabilities: %s", PhoneCapabilities.toString(callCapabilities));		Log.v(this, "setCallCapabilities: %s", PhoneCapabilities.toString(callCapabilities));
	if (mCallCapabilities != callCapabilities) {		if (forceUpdate \|\| mCallCapabilities != callCapabilities) {
	mCallCapabilities = callCapabilities;		mCallCapabilities = callCapabilities;
	for (Listener l : mListeners) {		for (Listener l : mListeners) {
	l.onCallCapabilitiesChanged(this);		l.onCallCapabilitiesChanged(this);

src/com/android/server/telecom/CallsManager.java

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1001,6 +1001,14 @@ public final class CallsManager extends Call.ListenerBase {
	}		}
	updateForegroundCall();		updateForegroundCall();
	}		}

			// Now that a call has been removed, other calls may gain new call capabilities (for
			// example, if only one call is left, it is now add-call capable again). Trigger the
			// recalculation of the call's current capabilities by forcing an update. (See
			// InCallController.toParcelableCall()).
			for (Call otherCall : mCalls) {
			otherCall.setCallCapabilities(call.getCallCapabilities(), true /* forceUpdate */);
			}
	}		}

	/**		/**