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

Commit f294d97e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Ensure proper ordering of silence vs audio processing" am: 5252f45d 

Change-Id: Ifa0f5833efede5b9c10f7a7915d440bba78e7dda
parents 8d312786 5252f45d

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

+4 −4
Original line number Diff line number Diff line
@@ -772,14 +772,14 @@ public class CallsManager extends Call.ListenerBase 
                            "dialing calls.");

                    rejectCallAndLog(incomingCall, result);

                }

            } else if (result.shouldSilence) {

                Log.i(this, "onCallFilteringCompleted: setting the call to silent ringing state");

                incomingCall.setSilentRingingRequested(true);

                addCall(incomingCall);

            } else if (result.shouldScreenViaAudio) {

                Log.i(this, "onCallFilteringCompleted: starting background audio processing");

                answerCallForAudioProcessing(incomingCall);

                incomingCall.setAudioProcessingRequestingApp(result.mCallScreeningAppName);

            } else if (result.shouldSilence) {

                Log.i(this, "onCallFilteringCompleted: setting the call to silent ringing state");

                incomingCall.setSilentRingingRequested(true);

                addCall(incomingCall);

            } else {

                addCall(incomingCall);

            }

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

+27 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import static org.mockito.ArgumentMatchers.nullable; 
import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -86,6 +87,7 @@ import com.android.server.telecom.Timeouts; 
import com.android.server.telecom.WiredHeadsetManager;

import com.android.server.telecom.bluetooth.BluetoothRouteManager;

import com.android.server.telecom.bluetooth.BluetoothStateReceiver;

import com.android.server.telecom.callfiltering.CallFilteringResult;

import com.android.server.telecom.callfiltering.IncomingCallFilter;

import com.android.server.telecom.ui.AudioProcessingNotification;

import com.android.server.telecom.ui.DisconnectedCallNotifier;
@@ -1211,6 +1213,31 @@ public class CallsManagerTest extends TelecomTestCase { 
        assertFalse(outgoingCall.getStartWithSpeakerphoneOn());

    }



    /**

     * Make sure that CallsManager handles a screening result that has both

     * silence and screen-further set to true as a request to screen further.

     * @throws Exception

     */

    @SmallTest

    @Test

    public void testHandleSilenceVsBackgroundScreeningOrdering() throws Exception {

        Call screenedCall = mock(Call.class);

        String appName = "blah";

        CallFilteringResult result = new CallFilteringResult.Builder()

                .setShouldAllowCall(true)

                .setShouldReject(false)

                .setShouldSilence(true)

                .setShouldScreenViaAudio(true)

                .setShouldAddToCallLog(true)

                .setShouldShowNotification(true)

                .setCallScreeningAppName(appName)

                .build();

        mCallsManager.onCallFilteringComplete(screenedCall, result);



        verify(mConnectionSvrFocusMgr).requestFocus(eq(screenedCall),

                nullable(ConnectionServiceFocusManager.RequestFocusCallback.class));

        verify(screenedCall).setAudioProcessingRequestingApp(appName);

    }



    private Call addSpyCall() {

        return addSpyCall(SIM_2_HANDLE, CallState.ACTIVE);