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

Commit 70e0da9d authored by Pranav Madapurmath's avatar Pranav Madapurmath
Browse files

Revert "Terminate ICS (for BT) after the disconnect tone finishe..." 

Revert submission 20919444-btDisconnectTelecom

Reason for revert: Causes regression in Telecom CTS tests (b/266021486, b/266041214)

Reverted changes: /q/submissionid:20919444-btDisconnectTelecom

Change-Id: I3607aa947ce2f59fd7bb3cf8d83a85b901162b4e
parent 69316c5a

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

+1 −29
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.media.ToneGenerator; 
import android.os.UserHandle;

import android.telecom.CallAudioState;

import android.telecom.Log;

import android.telecom.Phone;

import android.telecom.PhoneAccount;

import android.telecom.VideoProfile;

import android.util.SparseArray;
@@ -44,13 +43,6 @@ public class CallAudioManager extends CallsManagerListenerBase { 
        IAudioService getAudioService();

    }



    // success message to be logged when disconnected tone future is completed

    public static final String DISCONNECTED_TONE_SUCCESS_MSG = "Successfully completed "

            + "disconnected tone future.";

    // failure message to be logged when disconnected tone future cannot be MANUALLY completed

    public static final String DISCONNECTED_TONE_FAILURE_MSG = "Disconnected tone future timed"

            + " out.";



    private final String LOG_TAG = CallAudioManager.class.getSimpleName();



    private final LinkedHashSet<Call> mActiveDialingOrConnectingCalls;
@@ -845,19 +837,16 @@ public class CallAudioManager extends CallsManagerListenerBase { 
    }



    private void playToneForDisconnectedCall(Call call) {

        String callId = call.getId();

        // If this call is being disconnected as a result of being handed over to another call,

        // we will not play a disconnect tone.

        if (call.isHandoverInProgress()) {

            Log.i(LOG_TAG, "Omitting tone because %s is being handed over.", call);

            completeDisconnectedToneFuture(callId);

            return;

        }



        if (mForegroundCall != null && call != mForegroundCall && mCalls.size() > 1) {

            Log.v(LOG_TAG, "Omitting tone because we are not foreground" +

                    " and there is another call.");

            completeDisconnectedToneFuture(callId);

            return;

        }
@@ -893,16 +882,11 @@ public class CallAudioManager extends CallsManagerListenerBase { 
            Log.d(this, "Found a disconnected call with tone to play %d.", toneToPlay);



            if (toneToPlay != InCallTonePlayer.TONE_INVALID) {

                InCallTonePlayer tonePlayer = mPlayerFactory.createPlayer(toneToPlay);

                // set call id in InCallTonePlayer to be used for future completion

                tonePlayer.setCallIdForDisconnectedToneFuture(callId);

                boolean didToneStart = tonePlayer.startTone();

                boolean didToneStart = mPlayerFactory.createPlayer(toneToPlay).startTone();

                if (didToneStart) {

                    mCallsManager.onDisconnectedTonePlaying(true);

                    mIsDisconnectedTonePlaying = true;

                }

            } else {

                completeDisconnectedToneFuture(callId);

            }

        }

    }
@@ -989,18 +973,6 @@ public class CallAudioManager extends CallsManagerListenerBase { 
                oldState == CallState.ON_HOLD;

    }



    @VisibleForTesting

    public boolean completeDisconnectedToneFuture(String callId){

        String logPrefix = "completeDisconnectedToneFuture: callId: %s; ";

        boolean result = Phone.completeDisconnectedToneFuture(callId);

        if (result) {

            Log.i(this, logPrefix + DISCONNECTED_TONE_SUCCESS_MSG, callId);

        } else {

            Log.w(this, logPrefix + DISCONNECTED_TONE_FAILURE_MSG, callId);

        }

        return result;

    }



    @VisibleForTesting

    public Set<Call> getTrackedCalls() {

        return mCalls;

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

+0 −11
Original line number Diff line number Diff line
@@ -206,9 +206,6 @@ public class InCallTonePlayer extends Thread { 
    /** For tones which are not generated using ToneGenerator. */

    private MediaPlayerAdapter mToneMediaPlayer = null;



    /** Used for lookup in handling disconnected tone future completion*/

    private String mCallId;



    /** Telecom lock object. */

    private final TelecomSystem.SyncRoot mLock;
@@ -515,10 +512,6 @@ public class InCallTonePlayer extends Thread { 
        sTonesPlaying.set(0);

    }



    public void setCallIdForDisconnectedToneFuture(String callId) {

        mCallId = callId;

    }



    private void cleanUpTonePlayer() {

        Log.d(this, "cleanUpTonePlayer(): posting cleanup");

        // Release focus on the main thread.
@@ -542,9 +535,5 @@ public class InCallTonePlayer extends Thread { 
                }

            }

        }.prepare());

        // try to complete disconnected tone future for mCallId (if present)

        if (mCallId != null) {

            mCallAudioManager.completeDisconnectedToneFuture(mCallId);

        }

    }

}

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

+0 −49
Original line number Diff line number Diff line
@@ -18,13 +18,10 @@ package com.android.server.telecom.tests; 


import android.media.ToneGenerator;

import android.telecom.DisconnectCause;

import android.telecom.Phone;

import android.test.suitebuilder.annotation.MediumTest;

import android.test.suitebuilder.annotation.SmallTest;

import android.util.ArrayMap;

import android.util.SparseArray;



import com.android.dx.mockito.inline.extended.ExtendedMockito;

import com.android.server.telecom.Call;

import com.android.server.telecom.CallAudioModeStateMachine;

import com.android.server.telecom.CallAudioModeStateMachine.MessageArgs;
@@ -47,14 +44,10 @@ import org.junit.runner.RunWith; 
import org.junit.runners.JUnit4;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.MockitoSession;



import java.util.Arrays;

import java.util.LinkedHashSet;

import java.util.List;

import java.util.Map;

import java.util.concurrent.CompletableFuture;

import java.util.concurrent.TimeUnit;

import java.util.stream.Collectors;



import static org.junit.Assert.assertEquals;
@@ -87,8 +80,6 @@ public class CallAudioManagerTest extends TelecomTestCase { 


    private CallAudioManager mCallAudioManager;



    private static final int DISCONNECTED_TONE_TIMEOUT = 4000;



    @Override

    @Before

    public void setUp() throws Exception {
@@ -611,46 +602,6 @@ public class CallAudioManagerTest extends TelecomTestCase { 
        assertMessageArgEquality(expectedArgs, captor.getValue());

    }



    @SmallTest

    @Test

    public void testDisconnectedToneFuture() {

        Call call = mock(Call.class);

        when(call.getId()).thenReturn("testCallId");

        Map<String, CompletableFuture<Void>> disconnectedToneFutures = new ArrayMap<>();

        disconnectedToneFutures.put(call.getId(), new CompletableFuture<Void>()

                .completeOnTimeout(null, DISCONNECTED_TONE_TIMEOUT, TimeUnit.MILLISECONDS));



        MockitoSession session = ExtendedMockito.

                mockitoSession().spyStatic(Phone.class).startMocking();

        try {

            ExtendedMockito.doAnswer(invocation -> {

                String callId = invocation.getArgument(0);

                if (disconnectedToneFutures.containsKey(callId)) {

                    disconnectedToneFutures.get(callId).complete(null);

                    return true;

                } else {

                    return false;

                }

            }).when(() -> Phone.completeDisconnectedToneFuture(any(String.class)));



            // Add call

            mCallAudioManager.onCallAdded(call);

            // Disconnect call

            disconnectCall(call);

            // Simulate cleanup

            stopTone();

            // Verify that no future is completed on an invalid callId (i.e. not in map)

            boolean result = mCallAudioManager.completeDisconnectedToneFuture("");

            assertFalse(result);

            // Verify proper future completion

            result = mCallAudioManager.completeDisconnectedToneFuture(call.getId());

            assertTrue(result);

            assertTrue(disconnectedToneFutures.get(call.getId()).isDone());

        } finally {

            session.finishMocking();

        }

    }



    private Call createAudioProcessingCall() {

        Call call = mock(Call.class);

        when(call.getState()).thenReturn(CallState.AUDIO_PROCESSING);