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

Commit 2288cfeb authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Refactor startOutgoingCall in CallsManager" 

am: 4ab4a8a8

Change-Id: I515ea0a522c3c57369536a01bf1830073c24a6c2
parents af71ec3a 4ab4a8a8

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

+4 −8
Original line number Diff line number Diff line
@@ -551,8 +551,6 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
            CallsManager callsManager,

            TelecomSystem.SyncRoot lock,

            ConnectionServiceRepository repository,

            ContactsAsyncHelper contactsAsyncHelper,

            CallerInfoAsyncQueryFactory callerInfoAsyncQueryFactory,

            PhoneNumberUtilsAdapter phoneNumberUtilsAdapter,

            Uri handle,

            GatewayInfo gatewayInfo,
@@ -609,8 +607,6 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
            CallsManager callsManager,

            TelecomSystem.SyncRoot lock,

            ConnectionServiceRepository repository,

            ContactsAsyncHelper contactsAsyncHelper,

            CallerInfoAsyncQueryFactory callerInfoAsyncQueryFactory,

            PhoneNumberUtilsAdapter phoneNumberUtilsAdapter,

            Uri handle,

            GatewayInfo gatewayInfo,
@@ -622,8 +618,8 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
            long connectTimeMillis,

            long connectElapsedTimeMillis,

            ClockProxy clockProxy) {

        this(callId, context, callsManager, lock, repository, contactsAsyncHelper,

                callerInfoAsyncQueryFactory, phoneNumberUtilsAdapter, handle, gatewayInfo,

        this(callId, context, callsManager, lock, repository,

                phoneNumberUtilsAdapter, handle, gatewayInfo,

                connectionManagerPhoneAccountHandle, targetPhoneAccountHandle, callDirection,

                shouldAttachToExistingConnection, isConference, clockProxy);

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

+15 −4
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ import android.os.UserHandle; 
import android.os.UserManager;

import android.telecom.DefaultDialerManager;

import android.telecom.Log;

import android.telecom.Logging.Session;

import android.telecom.PhoneAccount;

import android.telecom.PhoneAccountHandle;

import android.telecom.TelecomManager;
@@ -19,6 +20,8 @@ import android.telephony.DisconnectCause; 
import android.telephony.PhoneNumberUtils;

import android.widget.Toast;



import java.util.concurrent.CompletableFuture;



/**

 * Single point of entry for all outgoing and incoming calls.

 * {@link com.android.server.telecom.components.UserCallIntentProcessor} serves as a trampoline that
@@ -146,13 +149,21 @@ public class CallIntentProcessor { 
        UserHandle initiatingUser = intent.getParcelableExtra(KEY_INITIATING_USER);



        // Send to CallsManager to ensure the InCallUI gets kicked off before the broadcast returns

        Call call = callsManager

        CompletableFuture<Call> callFuture = callsManager

                .startOutgoingCall(handle, phoneAccountHandle, clientExtras, initiatingUser,

                        intent, callingPackage);



        final Session logSubsession = Log.createSubsession();

        callFuture.thenAccept((call) -> {

            if (call != null) {

                Log.continueSession(logSubsession, "CIP.sNOCI");

                try {

                    sendNewOutgoingCallIntent(context, call, callsManager, intent);

                } finally {

                    Log.endSession();

                }

            }

        });

    }



    static void sendNewOutgoingCallIntent(Context context, Call call, CallsManager callsManager,

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

+449 −208

File changed.

Preview size limit exceeded, changes collapsed.

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

+5 −2
Original line number Diff line number Diff line
@@ -243,6 +243,10 @@ public class TelecomSystem { 
        mMissedCallNotifier = missedCallNotifierImplFactory

                .makeMissedCallNotifierImpl(mContext, mPhoneAccountRegistrar, defaultDialerCache);



        CallerInfoLookupHelper callerInfoLookupHelper =

                new CallerInfoLookupHelper(context, callerInfoAsyncQueryFactory,

                        mContactsAsyncHelper, mLock);



        EmergencyCallHelper emergencyCallHelper = new EmergencyCallHelper(mContext,

                mContext.getResources().getString(R.string.ui_default_package), timeoutsAdapter);
@@ -262,8 +266,7 @@ public class TelecomSystem { 
        mCallsManager = new CallsManager(

                mContext,

                mLock,

                mContactsAsyncHelper,

                callerInfoAsyncQueryFactory,

                callerInfoLookupHelper,

                mMissedCallNotifier,

                mPhoneAccountRegistrar,

                headsetMediaButtonFactory,

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

+3 −0
Original line number Diff line number Diff line
@@ -338,6 +338,9 @@ public class BasicCallTests extends TelecomSystemTest { 
                mInCallServiceFixtureY.getCall(callId).getState());

        mInCallServiceFixtureX.mInCallAdapter.phoneAccountSelected(callId,

                mPhoneAccountA0.getAccountHandle(), false);

        waitForHandlerAction(new Handler(Looper.getMainLooper()), TEST_TIMEOUT);

        waitForHandlerAction(new Handler(Looper.getMainLooper()), TEST_TIMEOUT);

        verifyAndProcessOutgoingCallBroadcast(mPhoneAccountA0.getAccountHandle());



        IdPair ids = outgoingCallPhoneAccountSelected(mPhoneAccountA0.getAccountHandle(),

                startingNumConnections, startingNumCalls, mConnectionServiceFixtureA);