DO NOT MERGE Handle child number changes after the call starts.

This CL is in master branch, but not in dialer branch, which causes a
merge conflict in master for ag/841237

Reverting ag/841237, cherry-picking this and will reapply ag/841237
later.


The child number display functionality assumed that the child number for
a call would only bet set at the start of the call.  This change removes
that assumption and supports changes to the child number at any point
during the call by adding a new listener to the InCall Call List.  It
appears there are some instances in reality where the child number can
come in after the start of a call (delayed only slightly, but enough to
prevent the number from showing up).

Bug: 24585039

(cherry picked from commit 7a2da71d22645d619e04b1704138f183a5e47724)

Change-Id: Id019dcb1fcdc7f13d738d9917bc9bbc4fe15dc02

1 files changed, 3 insertions, 2 deletions

diff --git a/InCallUI/src/com/android/incallui/Call.java b/InCallUI/src/com/android/incallui/Call.java
index d82346ebb..3ec94f9df 100644
--- a/InCallUI/src/com/android/incallui/Call.java
+++ b/InCallUI/src/com/android/incallui/Call.java
@@ -554,12 +554,13 @@ public class Call {
 
         Bundle callExtras = mTelecomCall.getDetails().getExtras();
         if (callExtras != null) {
-            // Child address arrives when the call is first set up, so we do not need to notify the
-            // UI of this.
+            // Check for a change in the child address and notify any listeners.
             if (callExtras.containsKey(Connection.EXTRA_CHILD_ADDRESS)) {
                 String childNumber = callExtras.getString(Connection.EXTRA_CHILD_ADDRESS);
+
                 if (!Objects.equals(childNumber, mChildNumber)) {
                     mChildNumber = childNumber;
+                    CallList.getInstance().onChildNumberChange(this);
                 }
             }