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

Commit 1f7d8edb authored by Thomas Stuart's avatar Thomas Stuart Committed by Android (Google) Code Review
Browse files

Merge "rm fix_audio_flicker_for_outgoing_calls flag" into main

parents 3973bf12 c0cc8962

flags/telecom_calls_manager_flags.aconfig

+0 −8
Original line number Diff line number Diff line 
package: "com.android.server.telecom.flags"

container: "system"



# OWNER=tjstuart TARGET=24Q3

flag {

  name: "fix_audio_flicker_for_outgoing_calls"

  namespace: "telecom"

  description: "This fix ensures the MO calls won't switch from Active to Quite b/c setDialing was not called"

  bug: "309540769"

}



# OWNER=breadley TARGET=24Q3

flag {

  name: "enable_call_sequencing"

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

+5 −14
Original line number Diff line number Diff line
@@ -920,10 +920,6 @@ public class CallsManager extends Call.ListenerBase 
        call.setPostCallPackageName(getRoleManagerAdapter().getDefaultCallScreeningApp(

                call.getAssociatedUser()));



        if (!mFeatureFlags.fixAudioFlickerForOutgoingCalls()) {

            setCallState(call, callState, "successful outgoing call");

        }



        if (!mCalls.contains(call)) {

            // Call was not added previously in startOutgoingCall due to it being a potential MMI

            // code, so add it now.
@@ -935,7 +931,6 @@ public class CallsManager extends Call.ListenerBase 
            listener.onConnectionServiceChanged(call, null, call.getConnectionService());

        }



        if (mFeatureFlags.fixAudioFlickerForOutgoingCalls()) {

        // Allow the ConnectionService to start the call in the active state. This case is

        // helpful for conference calls or meetings that can skip the dialing stage.

        if (callState == CallState.ACTIVE) {
@@ -944,10 +939,6 @@ public class CallsManager extends Call.ListenerBase 
            markCallAsDialing(call);

        }

    }

        else{

            markCallAsDialing(call);

        }

    }



    @Override

    public void onFailedOutgoingCall(Call call, DisconnectCause disconnectCause) {

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

+0 −2
Original line number Diff line number Diff line
@@ -2883,7 +2883,6 @@ public class CallsManagerTest extends TelecomTestCase { 
    @SmallTest

    @Test

    public void testOutgoingCallStateIsSetToAPreviousStateAndIgnored() {

        when(mFeatureFlags.fixAudioFlickerForOutgoingCalls()).thenReturn(true);

        Call outgoingCall = addSpyCall(CallState.CONNECTING);

        mCallsManager.onSuccessfulOutgoingCall(outgoingCall, CallState.NEW);

        verify(outgoingCall, never()).setState(eq(CallState.NEW), any());
@@ -2896,7 +2895,6 @@ public class CallsManagerTest extends TelecomTestCase { 
    @SmallTest

    @Test

    public void testOutgoingCallStateCanAvoidDialingAndGoStraightToActive() {

        when(mFeatureFlags.fixAudioFlickerForOutgoingCalls()).thenReturn(true);

        Call outgoingCall = addSpyCall(CallState.CONNECTING);

        mCallsManager.onSuccessfulOutgoingCall(outgoingCall, CallState.ACTIVE);

        verify(outgoingCall, never()).setState(eq(CallState.DIALING), any());