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, 13 insertions, 0 deletions

diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index a0c1cef86..0b17e1a03 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -378,6 +378,19 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
         updatePrimaryDisplayInfo();
     }
 
+    /**
+     * Handles a change to the child number by refreshing the primary call info.
+     */
+    @Override
+    public void onChildNumberChange() {
+        Log.v(this, "onChildNumberChange");
+
+        if (mPrimary == null) {
+            return;
+        }
+        updatePrimaryDisplayInfo();
+    }
+
     private String getSubscriptionNumber() {
         // If it's an emergency call, and they're not populating the callback number,
         // then try to fall back to the phone sub info (to hopefully get the SIM's