Correct FocusManager issue which prevented swapping calls. am: 78aa48433c (62bb4415) · Commits · e / os / android_packages_services_Telecomm

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -802,6 +802,18 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable,
		return mState;
		}

		/**
		* Determines if this {@link Call} can receive call focus via the
		* {@link ConnectionServiceFocusManager}.
		* Only top-level calls and non-external calls are eligible.
		* @return {@code true} if this call is focusable, {@code false} otherwise.
		*/
		@Override
		public boolean isFocusable() {
		boolean isChild = getParentCall() != null;
		return !isChild && !isExternalCall();
		}

		private boolean shouldContinueProcessingAfterDisconnect() {
		// Stop processing once the call is active.
		if (!CreateConnectionTimeout.isCallBeingPlaced(this)) {

+7 −1

Original line number	Diff line number	Diff line
		@@ -112,6 +112,11 @@ public class ConnectionServiceFocusManager {
		* @see {@link CallState}
		*/
		int getState();

		/**
		* @return {@code True} if this call can receive focus, {@code false} otherwise.
		*/
		boolean isFocusable();
		}

		/** Interface define a call back for focus request event. */
		@@ -330,7 +335,8 @@ public class ConnectionServiceFocusManager {

		List<CallFocus> calls = mCalls
		.stream()
		.filter(call -> mCurrentFocus.equals(call.getConnectionServiceWrapper()))
		.filter(call -> mCurrentFocus.equals(call.getConnectionServiceWrapper())
		&& call.isFocusable())
		.collect(Collectors.toList());

		for (int i = 0; i < PRIORITY_FOCUS_CALL_STATE.length; i++) {

+15 −0

Original line number	Diff line number	Diff line
		@@ -307,6 +307,20 @@ public class ConnectionServiceFocusManagerTest extends TelecomTestCase {
		assertTrue(mFocusManagerUT.getAllCall().contains(mActiveCall));
		}

		@SmallTest
		@Test
		public void testNonFocusableDoesntChangeFocus() {
		// GIVEN the ConnectionServiceFocusManager with the focus ConnectionService
		requestFocus(mActiveCall, null);

		// WHEN a new non-focusable call is added.
		when(mNewCall.isFocusable()).thenReturn(false);
		mCallsManagerListener.onCallAdded((Call) mNewCall);

		// THEN the call focus isn't changed.
		assertEquals(mActiveCall, mFocusManagerUT.getCurrentFocusCall());
		}

		private void requestFocus(CallFocus call, RequestFocusCallback callback) {
		mCallsManagerListener.onCallAdded((Call) call);
		mFocusManagerUT.requestFocus(call, callback);
		@@ -344,6 +358,7 @@ public class ConnectionServiceFocusManagerTest extends TelecomTestCase {
		Call call = Mockito.mock(Call.class);
		when(call.getConnectionServiceWrapper()).thenReturn(connSvr);
		when(call.getState()).thenReturn(state);
		when(call.isFocusable()).thenReturn(true);
		return call;
		}
		}