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

Commit b6967b43 authored by Grant Menke's avatar Grant Menke
Browse files

Revert "Unbind CS if connection is not created within 15 seconds." 

This reverts commit 59052739.

Reason for revert: Causes NPE (b/293458004); will submit a clean fix after revert

Merged-In: Ib845c6d52c5839b12cb9f8fa8b72cd0c7b10dbe5

Merged-In: I32fe284a867f1fbd3aa3064023723186a2ba529f

Merged-In: I0ee92a22dd6b3d505899c896b9cb5ec2fbd521f6

Change-Id: Ic020da295236d857df1adcf4f8a5c99d50b8fc42
parent 01055f01

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

+0 −26
Original line number Diff line number Diff line
@@ -353,17 +353,6 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
    /** The state of the call. */

    private int mState;



    /**

     * Determines whether the {@link ConnectionService} has responded to the initial request to

     * create the connection.

     *

     * {@code false} indicates the {@link Call} has been added to Telecom, but the

     * {@link Connection} has not yet been returned by the associated {@link ConnectionService}.

     * {@code true} indicates the {@link Call} has an associated {@link Connection} reported by the

     * {@link ConnectionService}.

     */

    private boolean mIsCreateConnectionComplete = false;



    /** The handle with which to establish this call. */

    private Uri mHandle;
@@ -1049,19 +1038,6 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
        return mConnectionService;

    }



    /**

     * @return {@code true} if the connection has been created by the underlying

     * {@link ConnectionService}, {@code false} otherwise.

     */

    public boolean isCreateConnectionComplete() {

        return mIsCreateConnectionComplete;

    }



    @VisibleForTesting

    public void setIsCreateConnectionComplete(boolean isCreateConnectionComplete) {

        mIsCreateConnectionComplete = isCreateConnectionComplete;

    }



    @VisibleForTesting

    public int getState() {

        return mState;
@@ -2213,7 +2189,6 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
            CallIdMapper idMapper,

            ParcelableConference conference) {

        Log.v(this, "handleCreateConferenceSuccessful %s", conference);

        mIsCreateConnectionComplete = true;

        setTargetPhoneAccount(conference.getPhoneAccount());

        setHandle(conference.getHandle(), conference.getHandlePresentation());
@@ -2247,7 +2222,6 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
            CallIdMapper idMapper,

            ParcelableConnection connection) {

        Log.v(this, "handleCreateConnectionSuccessful %s", connection);

        mIsCreateConnectionComplete = true;

        setTargetPhoneAccount(connection.getPhoneAccount());

        setHandle(connection.getHandle(), connection.getHandlePresentation());

        setCallerDisplayName(

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

+2 −72
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import android.telecom.ConnectionService; 
import android.telecom.DisconnectCause;

import android.telecom.GatewayInfo;

import android.telecom.Log;

import android.telecom.Logging.Runnable;

import android.telecom.Logging.Session;

import android.telecom.ParcelableConference;

import android.telecom.ParcelableConnection;
@@ -62,11 +61,6 @@ import java.util.List; 
import java.util.Map;

import java.util.Set;

import java.util.concurrent.ConcurrentHashMap;

import java.util.concurrent.ExecutorService;

import java.util.concurrent.Executors;

import java.util.concurrent.ScheduledExecutorService;

import java.util.concurrent.ScheduledFuture;

import java.util.concurrent.TimeUnit;



/**

 * Wrapper for {@link IConnectionService}s, handles binding to {@link IConnectionService} and keeps
@@ -80,11 +74,6 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 


    private static final String TELECOM_ABBREVIATION = "cast";



    private static final long SERVICE_BINDING_TIMEOUT = 15000L;

    private ScheduledExecutorService mScheduledExecutor =

            Executors.newSingleThreadScheduledExecutor();

    // Pre-allocate space for 2 calls; realistically thats all we should ever need (tm)

    private final Map<Call, ScheduledFuture<?>> mScheduledFutureMap = new ConcurrentHashMap<>(2);

    private final class Adapter extends IConnectionServiceAdapter.Stub {



        @Override
@@ -97,12 +86,6 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
            try {

                synchronized (mLock) {

                    logIncoming("handleCreateConnectionComplete %s", callId);

                    Call call = mCallIdMapper.getCall(callId);

                    if (mScheduledFutureMap.containsKey(call)) {

                        ScheduledFuture<?> existingTimeout = mScheduledFutureMap.get(call);

                        existingTimeout.cancel(false /* cancelIfRunning */);

                        mScheduledFutureMap.remove(call);

                    }

                    // Check status hints image for cross user access

                    if (connection.getStatusHints() != null) {

                        Icon icon = connection.getStatusHints().getIcon();
@@ -147,12 +130,6 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        conference.getStatusHints().setIcon(StatusHints.

                                validateAccountIconUserBoundary(icon, callingUserHandle));

                    }

                    Call call = mCallIdMapper.getCall(callId);

                    if (mScheduledFutureMap.containsKey(call)) {

                        ScheduledFuture<?> existingTimeout = mScheduledFutureMap.get(call);

                        existingTimeout.cancel(false /* cancelIfRunning */);

                        mScheduledFutureMap.remove(call);

                    }

                    ConnectionServiceWrapper.this

                            .handleCreateConferenceComplete(callId, request, conference);
@@ -1255,8 +1232,7 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
     * @param context The context.

     * @param userHandle The {@link UserHandle} to use when binding.

     */

    @VisibleForTesting

    public ConnectionServiceWrapper(

    ConnectionServiceWrapper(

            ComponentName componentName,

            ConnectionServiceRepository connectionServiceRepository,

            PhoneAccountRegistrar phoneAccountRegistrar,
@@ -1335,26 +1311,6 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        .setIsAdhocConferenceCall(call.isAdhocConferenceCall())

                        .build();



                Runnable r = new Runnable("CSW.cC", mLock) {

                            @Override

                            public void loggedRun() {

                                if (!call.isCreateConnectionComplete()) {

                                    Log.e(this, new Exception(),

                                            "Conference %s creation timeout",

                                            getComponentName());

                                    Log.addEvent(call, LogUtils.Events.CREATE_CONFERENCE_TIMEOUT,

                                            Log.piiHandle(call.getHandle()) + " via:" +

                                                    getComponentName().getPackageName());

                                    response.handleCreateConferenceFailure(

                                            new DisconnectCause(DisconnectCause.ERROR));

                                }

                            }

                        };

                // Post cleanup to the executor service and cache the future, so we can cancel it if

                // needed.

                ScheduledFuture<?> future = mScheduledExecutor.schedule(r.getRunnableToCancel(),

                        SERVICE_BINDING_TIMEOUT, TimeUnit.MILLISECONDS);

                mScheduledFutureMap.put(call, future);

                try {

                    mServiceInterface.createConference(

                            call.getConnectionManagerPhoneAccount(),
@@ -1452,26 +1408,6 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        .setRttPipeToInCall(call.getCsToInCallRttPipeForCs())

                        .build();



                Runnable r = new Runnable("CSW.cC", mLock) {

                            @Override

                            public void loggedRun() {

                                if (!call.isCreateConnectionComplete()) {

                                    Log.e(this, new Exception(),

                                            "Connection %s creation timeout",

                                            getComponentName());

                                    Log.addEvent(call, LogUtils.Events.CREATE_CONNECTION_TIMEOUT,

                                            Log.piiHandle(call.getHandle()) + " via:" +

                                                    getComponentName().getPackageName());

                                    response.handleCreateConnectionFailure(

                                            new DisconnectCause(DisconnectCause.ERROR));

                                }

                            }

                        };

                // Post cleanup to the executor service and cache the future, so we can cancel it if

                // needed.

                ScheduledFuture<?> future = mScheduledExecutor.schedule(r.getRunnableToCancel(),

                        SERVICE_BINDING_TIMEOUT, TimeUnit.MILLISECONDS);

                mScheduledFutureMap.put(call, future);

                try {

                    mServiceInterface.createConnection(

                            call.getConnectionManagerPhoneAccount(),
@@ -1881,8 +1817,7 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
        }

    }



    @VisibleForTesting

    public void addCall(Call call) {

    void addCall(Call call) {

        if (mCallIdMapper.getCallId(call) == null) {

            mCallIdMapper.addCall(call);

        }
@@ -2349,9 +2284,4 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
        sb.append("]");

        return sb.toString();

    }



    @VisibleForTesting

    public void setScheduledExecutorService(ScheduledExecutorService service) {

        mScheduledExecutor = service;

    }

}

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

+0 −2
Original line number Diff line number Diff line
@@ -126,10 +126,8 @@ public class LogUtils { 
        public static final String STOP_CALL_WAITING_TONE = "STOP_CALL_WAITING_TONE";

        public static final String START_CONNECTION = "START_CONNECTION";

        public static final String CREATE_CONNECTION_FAILED = "CREATE_CONNECTION_FAILED";

        public static final String CREATE_CONNECTION_TIMEOUT = "CREATE_CONNECTION_TIMEOUT";

        public static final String START_CONFERENCE = "START_CONFERENCE";

        public static final String CREATE_CONFERENCE_FAILED = "CREATE_CONFERENCE_FAILED";

        public static final String CREATE_CONFERENCE_TIMEOUT = "CREATE_CONFERENCE_TIMEOUT";

        public static final String BIND_CS = "BIND_CS";

        public static final String CS_BOUND = "CS_BOUND";

        public static final String CONFERENCE_WITH = "CONF_WITH";

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

+0 −2
Original line number Diff line number Diff line
@@ -978,7 +978,6 @@ public class BasicCallTests extends TelecomSystemTest { 
        call.setTargetPhoneAccount(mPhoneAccountA1.getAccountHandle());

        assert(call.isVideoCallingSupportedByPhoneAccount());

        assertEquals(VideoProfile.STATE_BIDIRECTIONAL, call.getVideoState());

        call.setIsCreateConnectionComplete(true);

    }



    /**
@@ -1002,7 +1001,6 @@ public class BasicCallTests extends TelecomSystemTest { 
        call.setTargetPhoneAccount(mPhoneAccountA2.getAccountHandle());

        assert(!call.isVideoCallingSupportedByPhoneAccount());

        assertEquals(VideoProfile.STATE_AUDIO_ONLY, call.getVideoState());

        call.setIsCreateConnectionComplete(true);

    }



    /**

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

+0 −54
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import static org.mockito.Mockito.timeout; 
import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

import static java.lang.Thread.sleep;



import android.content.ComponentName;

import android.content.ContentResolver;
@@ -51,7 +50,6 @@ import android.content.Intent; 
import android.net.Uri;

import android.os.Bundle;

import android.os.Handler;

import android.os.IBinder;

import android.os.Looper;

import android.os.Process;

import android.os.SystemClock;
@@ -73,7 +71,6 @@ import android.test.suitebuilder.annotation.SmallTest; 
import android.util.Pair;

import android.widget.Toast;



import com.android.internal.telecom.IConnectionService;

import com.android.server.telecom.AsyncRingtonePlayer;

import com.android.server.telecom.Call;

import com.android.server.telecom.CallAudioManager;
@@ -88,7 +85,6 @@ import com.android.server.telecom.ClockProxy; 
import com.android.server.telecom.ConnectionServiceFocusManager;

import com.android.server.telecom.ConnectionServiceFocusManager.ConnectionServiceFocusManagerFactory;

import com.android.server.telecom.ConnectionServiceWrapper;

import com.android.server.telecom.CreateConnectionResponse;

import com.android.server.telecom.DefaultDialerCache;

import com.android.server.telecom.EmergencyCallHelper;

import com.android.server.telecom.HeadsetMediaButton;
@@ -220,7 +216,6 @@ public class CallsManagerTest extends TelecomTestCase { 
    @Mock private RoleManagerAdapter mRoleManagerAdapter;

    @Mock private ToastFactory mToastFactory;

    @Mock private Toast mToast;

    @Mock private IConnectionService mIConnectionService;



    private CallsManager mCallsManager;
@@ -288,19 +283,11 @@ public class CallsManagerTest extends TelecomTestCase { 
                eq(SIM_2_HANDLE), any())).thenReturn(SIM_2_ACCOUNT);

        when(mToastFactory.makeText(any(), anyInt(), anyInt())).thenReturn(mToast);

        when(mToastFactory.makeText(any(), any(), anyInt())).thenReturn(mToast);

        when(mIConnectionService.asBinder()).thenReturn(mock(IBinder.class));



        mComponentContextFixture.addConnectionService(new ComponentName(mContext.getPackageName(),

                mContext.getPackageName().getClass().getName()), mIConnectionService);

    }



    @Override

    @After

    public void tearDown() throws Exception {

        mComponentContextFixture.removeConnectionService(

                new ComponentName(mContext.getPackageName(),

                        mContext.getPackageName().getClass().getName()),

                mock(IConnectionService.class));

        super.tearDown();

    }
@@ -1662,32 +1649,6 @@ public class CallsManagerTest extends TelecomTestCase { 
        assertTrue(argumentCaptor.getValue().contains("Unavailable phoneAccountHandle"));

    }



    @Test

    public void testConnectionServiceCreateConnectionTimeout() throws Exception {

        ConnectionServiceWrapper service = new ConnectionServiceWrapper(new ComponentName(

                mContext.getPackageName(), mContext.getPackageName().getClass().getName()), null,

                mPhoneAccountRegistrar, mCallsManager, mContext, mLock, null);

        TestScheduledExecutorService scheduledExecutorService = new TestScheduledExecutorService();

        service.setScheduledExecutorService(scheduledExecutorService);

        Call call = addSpyCall();

        service.addCall(call);

        when(call.isCreateConnectionComplete()).thenReturn(false);

        CreateConnectionResponse response = mock(CreateConnectionResponse.class);



        service.createConnection(call, response);

        waitUntilConditionIsTrueOrTimeout(new Condition() {

            @Override

            public Object expected() {

                return true;

            }



            @Override

            public Object actual() {

                return scheduledExecutorService.isRunnableScheduledAtTime(15000L);

            }

        }, 5000L, "Expected job failed to schedule");

    }



    private Call addSpyCall() {

        return addSpyCall(SIM_2_HANDLE, CallState.ACTIVE);

    }
@@ -1780,19 +1741,4 @@ public class CallsManagerTest extends TelecomTestCase { 
        when(mPhoneAccountRegistrar.getSimPhoneAccountsOfCurrentUser()).thenReturn(

                new ArrayList<>(Arrays.asList(SIM_1_HANDLE, SIM_2_HANDLE)));

    }



    private void waitUntilConditionIsTrueOrTimeout(Condition condition, long timeout,

            String description) throws InterruptedException {

        final long start = System.currentTimeMillis();

        while (!condition.expected().equals(condition.actual())

                && System.currentTimeMillis() - start < timeout) {

            sleep(50);

        }

        assertEquals(description, condition.expected(), condition.actual());

    }



    protected interface Condition {

        Object expected();

        Object actual();

    }

}