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

Commit e9d6fd24 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "disconnect or ignore onAnswer/onSetAnswer CCCs that are rejected" into... 

Merge "disconnect or ignore onAnswer/onSetAnswer CCCs that are rejected" into udc-dev am: 14dc0110

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/22955566



Change-Id: Idcd7d9329fee5341d2ebd07cc65d02bbd750c748
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6ea0289a 14dc0110

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

+9 −0
Original line number Diff line number Diff line
@@ -425,6 +425,15 @@ public class TransactionalServiceWrapper implements 


                    @Override

                    public void onError(CallException exception) {

                        if (isAnswerRequest) {

                            // This also sends the signal to untrack from TSW and the client_TSW

                            removeCallFromCallsManager(call,

                                    new DisconnectCause(DisconnectCause.REJECTED,

                                            "client rejected to answer the call;"

                                                    + " force disconnecting"));

                        } else {

                            mCallsManager.markCallAsOnHold(call);

                        }

                        maybeResetForegroundCall(foregroundCallBeforeSwap, wasActive);

                    }

                });

src/com/android/server/telecom/voip/CallEventCallbackAckTransaction.java

+2 −0
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ public class CallEventCallbackAckTransaction extends VoipCallTransaction { 
            boolean success = latch.await(VoipCallTransaction.TIMEOUT_LIMIT, TimeUnit.MILLISECONDS);

            if (!success) {

                // client send onError and failed to complete transaction

                Log.i(TAG, String.format("CallEventCallbackAckTransaction:"

                        + " client failed to complete the [%s] transaction", mAction));

                return CompletableFuture.completedFuture(TRANSACTION_FAILED);

            } else {

                // success