commit 45e7d5c95e656953508b567555db464aede3bdb1
author Tyler Gunn <tgunn@google.com> Mon Nov 09 12:21:58 2015 -0800
committer Jay Shrauner <shrauner@google.com> Mon Jan 11 18:43:19 2016 +0000
tree 16cc17412c62d43a54cfc4ce28e3c77b8edac411
parent 699fc20598c9dd933ba1c8be0e3cb7992ef71aad

DO NOT MERGE Show child number in incoming call notification.

Where a child number is present in the call extras, show it using the
text "via 650-555-1212" in the second line of the incoming call
notification.

Bug: 24585039
Change-Id: Ic9827f8518778bf5e9c36235e2e1b6525aba4928
(cherry picked from commit 2e5cfc1a71942e2ca2c8e469042e82c1b4640476)

InCallUI/src/com/android/incallui/StatusBarNotifier.java

diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
index fde2dc9..1f2729e 100644
--- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java
+++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
@@ -439,10 +439,14 @@
         boolean isIncomingOrWaiting = call.getState() == Call.State.INCOMING ||
                 call.getState() == Call.State.CALL_WAITING;
 
-        if (isIncomingOrWaiting && !TextUtils.isEmpty(call.getCallSubject()) &&
-                call.getNumberPresentation() == TelecomManager.PRESENTATION_ALLOWED &&
-                call.isCallSubjectSupported()) {
-            return call.getCallSubject();
+        if (isIncomingOrWaiting &&
+                call.getNumberPresentation() == TelecomManager.PRESENTATION_ALLOWED) {
+
+            if (!TextUtils.isEmpty(call.getChildNumber())) {
+                return mContext.getString(R.string.child_number, call.getChildNumber());
+            } else if (!TextUtils.isEmpty(call.getCallSubject()) && call.isCallSubjectSupported()) {
+                return call.getCallSubject();
+            }
         }
 
         int resId = R.string.notification_ongoing_call;