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

Commit 5b2880ad authored by Brad Ebinger's avatar Brad Ebinger
Browse files

resolve merge conflicts of d1b36695 to stage-aosp-master 

Change-Id: I5c771d7edf789ef8c70c9c0eb86243d8bc4a7549
parents 6b270d41 d1b36695

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

+0 −30
Original line number Diff line number Diff line
@@ -796,36 +796,6 @@ public class BasicCallTests extends TelecomSystemTest { 
                .pullExternalCall(ids.mConnectionId);

    }



    public void testMergeFailedAndNotifyInCallUi() throws Exception {

        IdPair testCall1 = startAndMakeActiveOutgoingCall(

                "650-555-1212",

                mPhoneAccountA0.getAccountHandle(),

                mConnectionServiceFixtureA);

        IdPair testCall2 = startAndMakeActiveOutgoingCall(

                "650-555-1213",

                mPhoneAccountA0.getAccountHandle(),

                mConnectionServiceFixtureA);



        assertEquals(Call.STATE_ACTIVE,

                mInCallServiceFixtureX.getCall(testCall1.mCallId).getState());

        assertEquals(Call.STATE_ACTIVE,

                mInCallServiceFixtureX.getCall(testCall2.mCallId).getState());

        assertEquals(Call.STATE_ACTIVE,

                mInCallServiceFixtureY.getCall(testCall1.mCallId).getState());

        assertEquals(Call.STATE_ACTIVE,

                mInCallServiceFixtureY.getCall(testCall2.mCallId).getState());



        // Conference will not occur and instead will send setConferenceMergeFailed

        ((ConnectionServiceFixture.FakeConnection)

                mConnectionServiceFixtureA.mLatestConnection).setIsConferenceCreated(false);

        mInCallServiceFixtureX.getInCallAdapter().conference(testCall2.mCallId, testCall1.mCallId);



        verify(mInCallServiceFixtureX.getTestDouble(), timeout(TEST_TIMEOUT)).onConnectionEvent(

                eq(testCall2.mCallId), eq(Connection.EVENT_CALL_MERGE_FAILED), any(Bundle.class));

        verify(mInCallServiceFixtureY.getTestDouble(), timeout(TEST_TIMEOUT)).onConnectionEvent(

                eq(testCall2.mCallId), eq(Connection.EVENT_CALL_MERGE_FAILED), any(Bundle.class));

    }



    @LargeTest

    public void testEmergencyCallFailMoveToSecondSim() throws Exception {

        IdPair ids = startAndMakeDialingEmergencyCall("650-555-1212",

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

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ import static org.mockito.Matchers.anyInt; 
import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.eq;

import static org.mockito.Matchers.isNull;

import static org.mockito.Matchers.isNull;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

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

+2 −5
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ public class TelecomSystemTest extends TelecomTestCase { 
            return mInterruptionFilter;

        }

    }



    @Mock HeadsetMediaButton mHeadsetMediaButton;

    @Mock ProximitySensorManager mProximitySensorManager;

    @Mock InCallWakeLockController mInCallWakeLockController;
@@ -256,8 +255,7 @@ public class TelecomSystemTest extends TelecomTestCase { 
                    .setCapabilities(

                            PhoneAccount.CAPABILITY_CALL_PROVIDER |

                                    PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION |

                                    PhoneAccount.CAPABILITY_PLACE_EMERGENCY_CALLS |

                                    PhoneAccount.CAPABILITY_VIDEO_CALLING)

                                    PhoneAccount.CAPABILITY_PLACE_EMERGENCY_CALLS)

                    .build();



    final PhoneAccount mPhoneAccountE1 =
@@ -270,8 +268,7 @@ public class TelecomSystemTest extends TelecomTestCase { 
                    .setCapabilities(

                            PhoneAccount.CAPABILITY_CALL_PROVIDER |

                                    PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION |

                                    PhoneAccount.CAPABILITY_PLACE_EMERGENCY_CALLS |

                                    PhoneAccount.CAPABILITY_VIDEO_CALLING)

                                    PhoneAccount.CAPABILITY_PLACE_EMERGENCY_CALLS)

                    .build();



    ConnectionServiceFixture mConnectionServiceFixtureA;