commit 699819b0cfd3f498d61506c4b020a8ed49642538
author Tyler Gunn <tgunn@google.com> Fri Jul 14 23:06:25 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 14 23:06:25 2017 +0000
tree 028e6dcd3fff0b318eda0acf059be2574d19aa24
parent 13d997f15759043f71c84f61523129c7232f3b46
parent 5ec8567ce5da254a069c4908747d64c3774af8c3

Merge "Remove passing of SIP history-info information." into oc-dr1-dev am: 0785906a2e
am: 5ec8567ce5

Change-Id: Id011e652035891d949c4e2167ecaec2101565046

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 9161b93..d8079f7 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -157,15 +157,6 @@
                         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);