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

Commit 9201f79f authored by Grant Menke's avatar Grant Menke Committed by Android (Google) Code Review
Browse files

Revert "Ignore requests to remove a call when there are pending connection attempts." 

This reverts commit bd80a45d.

Reason for revert: Squashing this together to merge in as standalone change with ag/27274403

Change-Id: I0bd1c2197f14546b782d016a4243a4695f5436e5
parent bd80a45d

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

+0 −11
Original line number Diff line number Diff line
@@ -2540,17 +2540,6 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
        }

    }



    boolean completedProcessingAllAttempts() {

        if (mCreateConnectionProcessor != null) {

            return (!mCreateConnectionProcessor.isCallTimedOut() &&

                    mCreateConnectionProcessor.isProcessingComplete());

        } else {

            // If mCreateConnectionProcessor is null then there are no attempts to process:

            return true;

        }



    }



    /**

     * Starts the create connection sequence. Upon completion, there should exist an active

     * connection through a connection service (or the call will have failed).

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

+1 −11
Original line number Diff line number Diff line
@@ -385,15 +385,7 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                            mCallsManager.markCallAsDisconnected(

                                    call, new DisconnectCause(DisconnectCause.REMOTE));

                        }

                        if (!mFlags.updatedRcsCallCountTracking()){

                        mCallsManager.markCallAsRemoved(call);

                        } else if (call.completedProcessingAllAttempts()

                                || !call.isEmergencyCall()) {

                            mCallsManager.markCallAsRemoved(call);

                        } else {

                            Log.i(this, "removeCall: emergency call has not "

                                    + "completed processing all attempts so skipping removal");

                        }

                    }

                }

            } catch (Throwable t) {
@@ -1357,7 +1349,6 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
    private final CallsManager mCallsManager;

    private final AppOpsManager mAppOpsManager;

    private final Context mContext;

    private final FeatureFlags mFlags;



    private ConnectionServiceFocusManager.ConnectionServiceFocusListener mConnSvrFocusListener;
@@ -1392,7 +1383,6 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
        mCallsManager = callsManager;

        mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);

        mContext = context;

        mFlags = featureFlags;

    }



    /** See {@link IConnectionService#addConnectionServiceAdapter}. */