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

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

Merge "Clean up on_call_endpoint_changed_ics_on_connected" into main

parents 42d55d5a 52bc9cfa

flags/telecom_incallservice_flags.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -25,14 +25,6 @@ flag { 
  bug: "306395598"

}



# OWNER=pmadapurmath TARGET=24Q4

flag {

  name: "on_call_endpoint_changed_ics_on_connected"

  namespace: "telecom"

  description: "Ensure onCallEndpointChanged is sent to ICS when it connects."

  bug: "348297436"

}



# OWNER=tjstuart TARGET=24Q4

flag {

  name: "do_not_send_call_to_null_ics"

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

+2 −4
Original line number Diff line number Diff line
@@ -2678,10 +2678,8 @@ public class InCallController extends CallsManagerListenerBase implements 
        try {

            inCallService.onCallAudioStateChanged(mCallsManager.getAudioState());

            inCallService.onCanAddCallChanged(mCallsManager.canAddCall());

            if (mFeatureFlags.onCallEndpointChangedIcsOnConnected()) {

            inCallService.onCallEndpointChanged(mCallsManager.getCallEndpointController()

                    .getCurrentCallEndpoint());

            }

        } catch (RemoteException ignored) {

        }

        // Don't complete the binding future for non-ui incalls

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

+0 −1
Original line number Diff line number Diff line
@@ -314,7 +314,6 @@ public class InCallControllerTests extends TelecomTestCase { 
                .thenReturn(PackageManager.PERMISSION_DENIED);



        when(mMockCallsManager.getAudioState()).thenReturn(new CallAudioState(false, 0, 0));

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

        when(mMockCallsManager.getCallEndpointController()).thenReturn(mMockCallEndpointController);

        when(mMockCallEndpointController.getCurrentCallEndpoint())

                .thenReturn(new CallEndpoint("Earpiece", 1));