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

Commit 73d4e3c1 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10934304 from b14e835f to 24Q1-release

Change-Id: Ie908a928fd0b26ff01e1d40192b3caaa4c53e201
parents 771c4e9e b14e835f
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -6,3 +6,10 @@ flag {
  description: "When set, Telecom support for additional VOIP application actions is active."
  bug: "296934278"
}

flag {
  name: "call_details_id_changes"
  namespace: "telecom"
  description: "When set, call details/extras id updates to Telecom APIs for Android V are active."
  bug: "301713560"
}
 No newline at end of file
+8 −5
Original line number Diff line number Diff line
@@ -5533,9 +5533,10 @@ public class CallsManager extends Call.ListenerBase
            // We are going to place the new outgoing call, so disconnect any ongoing self-managed
            // calls which are ongoing at this time.
            disconnectSelfManagedCalls("outgoing call " + callId);

            if (mPendingCallConfirm != null) {
                mPendingCallConfirm.complete(mPendingCall);
                mPendingCallConfirm = null;
            }
            mPendingCall = null;
        }
    }
@@ -5554,10 +5555,12 @@ public class CallsManager extends Call.ListenerBase
            markCallAsDisconnected(mPendingCall, new DisconnectCause(DisconnectCause.CANCELED));
            markCallAsRemoved(mPendingCall);
            mPendingCall = null;
            if (mPendingCallConfirm != null) {
                mPendingCallConfirm.complete(null);
                mPendingCallConfirm = null;
            }
        }
    }

    /**
     * Called from {@link #startOutgoingCall(Uri, PhoneAccountHandle, Bundle, UserHandle, Intent, String)} when