commit b054811d5e35cf9660e2be52f96005e764c1ddd8
author Tyler Gunn <tgunn@google.com> Wed Sep 20 11:43:33 2017 -0700
committer Tyler Gunn <tgunn@google.com> Wed Sep 20 11:43:33 2017 -0700
tree 9d2ce8b76c73c083504c0b191d3a7d6f06cdb44a
parent f5831ef556338c80d48f45fe4ed3e33883974e16
parent 80ccafe55e3bfe9bf6fcd46162f32402fc38b10b

resolve merge conflicts of 80ccafe55 to stage-aosp-master

Change-Id: I8a6be1825cb4398a2b4b59595c987dadc1ebb6bc

src/com/android/services/telephony/TelephonyConnection.java

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 4fc45cb..4c8f8c1 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -159,6 +159,15 @@
                         mSsNotification =
                                 (SuppServiceNotification)((AsyncResult) msg.obj).result;
                         if (mOriginalConnection != null) {
+                            if (mSsNotification.history != null) {
+                                Bundle lastForwardedNumber = new Bundle();
+                                Log.v(TelephonyConnection.this,
+                                        "Updating call history info in extras.");
+                                lastForwardedNumber.putStringArrayList(
+                                        Connection.EXTRA_LAST_FORWARDED_NUMBER,
+                                        new ArrayList(Arrays.asList(mSsNotification.history)));
+                                putExtras(lastForwardedNumber);
+                            }
                             if (mSsNotification.code
                                     == SuppServiceNotification.MO_CODE_CALL_FORWARDED) {
                                 sendConnectionEvent(TelephonyManager.EVENT_CALL_FORWARDED, null);