commit 1f6bed880102dc4292a8affc4253fbd8c0c02fef
author Amit Mahajan <amitmahajan@google.com> Mon Dec 14 07:48:41 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 14 07:48:41 2020 +0000
tree 5c789b285d09741b6c4714236d0905f5281e023d
parent bb8f71cb40732f3e2eb952908e17cc985665cd70
parent 072740e81e89ace666cc49dab9a78ff1fd853ff1

Merge "Enable showing forwarded number"

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 09c83c0..3e7f29c 100755
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -1419,6 +1419,15 @@
         } else {
             extrasToRemove.add(Connection.EXTRA_DISABLE_ADD_CALL);
         }
+
+        if (mOriginalConnection != null) {
+            ArrayList<String> forwardedNumber = mOriginalConnection.getForwardedNumber();
+            if (forwardedNumber != null) {
+                extrasToPut.putStringArrayList(Connection.EXTRA_LAST_FORWARDED_NUMBER,
+                        forwardedNumber);
+            }
+        }
+
         putTelephonyExtras(extrasToPut);
         removeTelephonyExtras(extrasToRemove);