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

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

Merge "Clean up user request baseline route video call flag" into main

parents 5d84633f c4d764ec

flags/telecom_callaudioroutestatemachine_flags.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -130,17 +130,6 @@ flag { 
  }

}



# OWNER=pmadapurmath TARGET=25Q2

flag {

  name: "fix_user_request_baseline_route_video_call"

  namespace: "telecom"

  description: "Ensure that audio is routed out of speaker in a video call when we receive USER_SWITCH_BASELINE_ROUTE."

  bug: "374037591"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



# OWNER=tgunn TARGET=25Q2

flag {

  name: "only_clear_communication_device_on_inactive"

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

+0 −3
Original line number Diff line number Diff line
@@ -1377,9 +1377,6 @@ public class CallAudioRouteController implements CallAudioRouteAdapter { 
            boolean includeBluetooth, String btAddressToExclude) {

        boolean skipEarpiece = false;

        Call foregroundCall = mCallAudioManager.getForegroundCall();

        if (!mFeatureFlags.fixUserRequestBaselineRouteVideoCall()) {

            isExplicitUserRequest = false;

        }

        if (!isExplicitUserRequest) {

            synchronized (mTelecomLock) {

                skipEarpiece = foregroundCall != null

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

+0 −2
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ public class CallAudioRouteControllerTest extends TelecomTestCase { 
        when(mFeatureFlags.useRefactoredAudioRouteSwitching()).thenReturn(true);

        when(mFeatureFlags.resolveActiveBtRoutingAndBtTimingIssue()).thenReturn(false);

        when(mFeatureFlags.newAudioPathSpeakerBroadcastAndUnfocusedRouting()).thenReturn(false);

        when(mFeatureFlags.fixUserRequestBaselineRouteVideoCall()).thenReturn(false);

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

        BLUETOOTH_DEVICES.add(BLUETOOTH_DEVICE_1);

    }
@@ -1244,7 +1243,6 @@ public class CallAudioRouteControllerTest extends TelecomTestCase { 
    @Test

    @SmallTest

    public void testUserSwitchBaselineRouteVideoCall() {

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

        mController.initialize();

        mController.setActive(true);

        // Set capabilities for video call.