commit 072740e81e89ace666cc49dab9a78ff1fd853ff1
author Iwami Kazuki <kazuki.x.iwami@sonymobile.com> Tue Jun 21 20:29:46 2016 +0900
committer Masaya Nemoto <Masaya.Nemoto@sony.com> Thu Jan 16 20:49:09 2020 +0900
tree 016e53c012c07ef61223a80b6249f4a7cd1ef7fe
parent 64c865aaa57c43a839e16241910c5a59f6e05d10

Enable showing forwarded number

This commit adds some changes to:
-control the forwarded number display as per carrier config.
-store forwarded number into extras.

Test: manual - Confirmed that it stores forwarded number in
EXTRA_LAST_FORWARDED_NUMBER.
Test: auto - Passed FrameworksTelephonyTests
Bug: 29063067

Change-Id: Ib85d88073037b7b2f87717bb2dda174004499a3e

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 7d7b72b..aa24f94 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -1291,6 +1291,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);