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

Commit 0c403a28 authored by Pengquan Meng's avatar Pengquan Meng Committed by android-build-merger
Browse files

Revert "Integrate connectionServiceFocusManager into call flow" 

am: fc9c8ffc

Change-Id: I45f5faee1a3133bfd851514d94e89ee7b9851b79
parents 2e8ff200 fc9c8ffc

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

+2 −8
Original line number Diff line number Diff line
@@ -1763,8 +1763,7 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
    /**

     * Puts the call on hold if it is currently active.

     */

    @VisibleForTesting

    public void hold() {

    void hold() {

        if (mState == CallState.ACTIVE) {

            if (mConnectionService != null) {

                mConnectionService.hold(this);
@@ -1779,8 +1778,7 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
    /**

     * Releases the call from hold if it is currently active.

     */

    @VisibleForTesting

    public void unhold() {

    void unhold() {

        if (mState == CallState.ON_HOLD) {

            if (mConnectionService != null) {

                mConnectionService.unhold(this);
@@ -2802,10 +2800,6 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
        return mOriginalConnectionId;

    }



    ConnectionServiceFocusManager getConnectionServiceFocusManager() {

        return mCallsManager.getConnectionServiceFocusManager();

    }



    /**

     * Determines if a {@link Call}'s capabilities bitmask indicates that video is supported either

     * remotely or locally.

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

+139 −228

File changed.

Preview size limit exceeded, changes collapsed.

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

+13 −37

File changed.

Preview size limit exceeded, changes collapsed.

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

+4 −42

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −13
Original line number Diff line number Diff line
@@ -214,19 +214,7 @@ public class CreateConnectionProcessor implements CreateConnectionResponse { 
                mCall.setConnectionService(mService);

                setTimeoutIfNeeded(mService, attempt);



                // Start to create the connection after the ConnectionService of the call has gained

                // the focus.

                mCall.getConnectionServiceFocusManager().requestFocus(

                        mCall,

                        new CallsManager.RequestCallback(new CallsManager.PendingAction() {

                            @Override

                            public void performAction() {

                                Log.d(this, "perform create connection");

                                mService.createConnection(

                                        mCall,

                                        CreateConnectionProcessor.this);

                            }

                        }));

                mService.createConnection(mCall, this);

            }

        } else {

            Log.v(this, "attemptNextPhoneAccount, no more accounts, failing");