commit a5b57f02ca96d78b3223bb845fd7986281f18753
author Hall Liu <hallliu@google.com> Fri Jul 27 15:54:51 2018 -0700
committer Hall Liu <hallliu@google.com> Sat Jul 28 00:30:16 2018 +0000
tree 3e848eb330e13b4dec705adcf07b82e2888ab0b0
parent e677f01f4fa6eeb1e97d7ce0ec0f5b465c62905c

Fix setting handed-over calls to ANSWERED state

When a handover happens, CallsManager calls answerCall on it after the
handover completes (i.e. when it's already in the active state). Add a
check for the call being in the ringing state before marking it as
ANSWERED so that ACTIVE -> ANSWERED transition doesn't happen.

Bug: 111822381
Test: manual, unit
Change-Id: I19a2ffa948e5f968d0c10a3eba9bf817a77348ee

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

diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index a2e6370..a92da5f 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -3915,7 +3915,9 @@
             // We do not update the UI until we get confirmation of the answer() through
             // {@link #markCallAsActive}.
             mCall.answer(mVideoState);
-            setCallState(mCall, CallState.ANSWERED, "answered");
+            if (mCall.getState() == CallState.RINGING) {
+                setCallState(mCall, CallState.ANSWERED, "answered");
+            }
             if (isSpeakerphoneAutoEnabledForVideoCalls(mVideoState)) {
                 mCall.setStartWithSpeakerphoneOn(true);
             }

tests/src/com/android/server/telecom/tests/CallsManagerTest.java

diff --git a/tests/src/com/android/server/telecom/tests/CallsManagerTest.java b/tests/src/com/android/server/telecom/tests/CallsManagerTest.java
index 86214e9..8006c09 100644
--- a/tests/src/com/android/server/telecom/tests/CallsManagerTest.java
+++ b/tests/src/com/android/server/telecom/tests/CallsManagerTest.java
@@ -626,6 +626,25 @@
 
     @SmallTest
     @Test
+    public void testAnswerAlreadyActiveCall() {
+        // GIVEN a CallsManager with no ongoing call.
+
+        // WHEN answer an already active call
+        Call incomingCall = addSpyCall();
+        mCallsManager.answerCall(incomingCall, VideoProfile.STATE_AUDIO_ONLY);
+
+        // THEN the focus request for incoming call is sent
+        verifyFocusRequestAndExecuteCallback(incomingCall);
+
+        // and the incoming call is answered.
+        verify(incomingCall).answer(VideoProfile.STATE_AUDIO_ONLY);
+
+        // and the incoming call's state is still ACTIVE
+        assertEquals(CallState.ACTIVE, incomingCall.getState());
+    }
+
+    @SmallTest
+    @Test
     public void testSetActiveCallWhenOngoingCallCanNotBeHeldAndFromDifferentConnectionService() {
         ConnectionServiceWrapper connSvr1 = Mockito.mock(ConnectionServiceWrapper.class);
         ConnectionServiceWrapper connSvr2 = Mockito.mock(ConnectionServiceWrapper.class);