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

Commit cab60804 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "When in an ACTIVE call, SELECT_PHONE_ACCOUNT should work across subs" into main

parents 82725b30 60e56543

flags/telecom_calls_manager_flags.aconfig

+11 −0
Original line number Diff line number Diff line
@@ -30,3 +30,14 @@ flag { 
    purpose: PURPOSE_BUGFIX

  }

}



# OWNER=breadley TARGET=25Q3

flag {

  name: "select_phone_account_before_making_room"

  namespace: "telecom"

  description: "Select the PhoneAccount before making room for the call"

  bug: "417370866"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}

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

+401 −2

File changed.

Preview size limit exceeded, changes collapsed.

src/com/android/server/telecom/callsequencing/CallSequencingController.java

+2 −2
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ public class CallSequencingController { 
            return transactionFuture;

        }



        Call liveCall = mCallsManager.getFirstCallWithLiveState();

        Call liveCall = mCallsManager.getFirstCallWithLiveState(emergencyCall);

        Log.i(this, "makeRoomForOutgoingEmergencyCall: call = " + emergencyCall

                + " livecall = " + liveCall);
@@ -745,7 +745,7 @@ public class CallSequencingController { 


        // NOTE: If the amount of live calls changes beyond 1, this logic will probably

        // have to change.

        Call liveCall = mCallsManager.getFirstCallWithLiveState();

        Call liveCall = mCallsManager.getFirstCallWithLiveState(call);

        Log.i(this, "makeRoomForOutgoingCall call = " + call + " livecall = " +

                liveCall);

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

+2 −2
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ public class CallSequencingTests extends TelecomTestCase { 
        when(mCallsManager.hasRingingOrSimulatedRingingCall()).thenReturn(true);

        when(mCallsManager.getRingingOrSimulatedRingingCall()).thenReturn(mRingingCall);

        when(mCallsManager.hasMaximumLiveCalls(mNewCall)).thenReturn(true);

        when(mCallsManager.getFirstCallWithLiveState()).thenReturn(mActiveCall);

        when(mCallsManager.getFirstCallWithLiveState(mNewCall)).thenReturn(mActiveCall);

        when(mCallsManager.hasMaximumOutgoingCalls(mNewCall)).thenReturn(false);

        when(mCallsManager.hasMaximumManagedHoldingCalls(mNewCall)).thenReturn(false);

        when(mCallsManager.canHold(mActiveCall)).thenReturn(true);
@@ -718,7 +718,7 @@ public class CallSequencingTests extends TelecomTestCase { 


    private void setupMakeRoomForOutgoingCallMocks() {

        when(mCallsManager.hasMaximumLiveCalls(mNewCall)).thenReturn(true);

        when(mCallsManager.getFirstCallWithLiveState()).thenReturn(mActiveCall);

        when(mCallsManager.getFirstCallWithLiveState(mNewCall)).thenReturn(mActiveCall);

        setPhoneAccounts(mActiveCall, mNewCall, false);

        when(mActiveCall.isConference()).thenReturn(false);

        when(mCallsManager.hasMaximumOutgoingCalls(mNewCall)).thenReturn(false);