commit 278fdb13a33c42fccc29c82878820246ff9eb872
author qing <qingzhong@google.com> Tue Oct 26 19:05:51 2021 +0000
committer Qing Zhong <qingzhong@google.com> Wed Aug 02 19:11:34 2023 +0000
tree afbfd7ffff8e07c7a0834fb49ea7d359fb5ec544
parent eae843b7e6f3530a89f212034bb7cdffa85c3a80

Make call back order right for DISCONNECTED call

If call is initially a DISCONNECTED call, the callback will be fire in wrong sequence where onCallRemoved is fired before onCallAdded.
Bug: 203563157
Test: manual test


Change-Id: I4b13dc13b34a1547f0c68ced01b3c1177dfa9eb3
(cherry picked from commit 5495c83fb5dbf833082ce4c9c21c415580420a7f)
(cherry picked from commit fb9aec0c1175618759f5d7328fc42ec3c152cbe2)

telecomm/java/android/telecom/Phone.java

diff --git a/telecomm/java/android/telecom/Phone.java b/telecomm/java/android/telecom/Phone.java
index 95a8e16..61e829e7 100644
--- a/telecomm/java/android/telecom/Phone.java
+++ b/telecomm/java/android/telecom/Phone.java
@@ -174,6 +174,9 @@
             checkCallTree(parcelableCall);
             call.internalUpdate(parcelableCall, mCallByTelecomCallId);
             fireCallAdded(call);
+            if (call.getState() == Call.STATE_DISCONNECTED) {
+                internalRemoveCall(call);
+            }
         } else {
             Log.w(this, "Call %s added, but it was already present", call.internalGetCallId());
             checkCallTree(parcelableCall);