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

Commit ebbb9466 authored Jul 14, 2021 by Android Build Coastguard Worker

Snap for 7546601 from 4a0400e5 to sc-release

Change-Id: Ibc3d730cac0a30146d456fba628ee901ff6f9e55

parents b9961278 4a0400e5

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -3019,6 +3019,7 @@ public class CallsManager extends Call.ListenerBase
		*/
		boolean holdActiveCallForNewCall(Call call) {
		Call activeCall = (Call) mConnectionSvrFocusMgr.getCurrentFocusCall();
		Log.i(this, "holdActiveCallForNewCall, newCall: %s, activeCall: %s", call, activeCall);
		if (activeCall != null && activeCall != call) {
		if (canHold(activeCall)) {
		activeCall.hold();
		@@ -3074,6 +3075,7 @@ public class CallsManager extends Call.ListenerBase

		@VisibleForTesting
		public void markCallAsActive(Call call) {
		Log.i(this, "markCallAsActive, isSelfManaged: " + call.isSelfManaged());
		if (call.isSelfManaged()) {
		// backward compatibility, the self-managed connection service will set the call state
		// to active directly. We should hold or disconnect the current active call based on the

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -391,7 +391,7 @@ public class ConnectionServiceFocusManager {
		}

		private void handleRequestFocus(FocusRequest focusRequest) {
		Log.d(this, "handleRequestFocus req = %s", focusRequest);
		Log.i(this, "handleRequestFocus req = %s", focusRequest);
		if (mCurrentFocus == null
		\|\| mCurrentFocus.equals(focusRequest.call.getConnectionServiceWrapper())) {
		updateConnectionServiceFocus(focusRequest.call.getConnectionServiceWrapper());