commit 98ece9fa1c796514badcd60a2a810d5d938fb3c9
author Tyler Gunn <tgunn@google.com> Mon Nov 09 21:40:49 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 09 21:40:49 2015 +0000
tree 1a7db01e08379a792c782d64b7b01b7e13b015a6
parent d66b6cb6ebd6da0518410ff0151d634ef502143d
parent 758739a7d9daa296262079bf802e0a2f41dbe1b4

Show child number in incoming call notification. am: 2e5cfc1a71 am: 8af424c54d
am: 758739a7d9

* commit '758739a7d9daa296262079bf802e0a2f41dbe1b4':
  Show child number in incoming call notification.

src/com/android/incallui/StatusBarNotifier.java

diff --git a/src/com/android/incallui/StatusBarNotifier.java b/src/com/android/incallui/StatusBarNotifier.java
index 4d4e349..89794cd 100644
--- a/src/com/android/incallui/StatusBarNotifier.java
+++ b/src/com/android/incallui/StatusBarNotifier.java
@@ -430,10 +430,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;