commit 69cc1411ecf74bb9c7f68699f1b0b5c95b0183f9
author Yuchen Dong <yuchen.x.dong@sony.com> Mon Sep 27 20:27:01 2021 +0800
committer takeshi tanigawa <takeshi.tanigawa@sony.com> Thu Oct 21 12:49:11 2021 +0000
tree 013cbb875bf196aa2c81a9f8c9d4be4366a7d5fe
parent 8ecde2ba35e0098e65b2e3f70c1108f5427f0b1b

Set actual call forwarding enable status

After get call forwarding status, it always set call forwarding
enable status as true instead of the actual enable status. This
is incorrect, so set CallForwardingInfo according to the actual
enable status of callForwardInfo.

Test: auto - Passed TelephonyManagerTest
Bug: 201490546

Change-Id: Ie59a062db2d03f6899a12b7a4548fa7fc97256d7

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index db14924..e59d91a 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1009,7 +1009,9 @@
                             // any service for voice call.
                             if ((callForwardInfo.serviceClass
                                     & CommandsInterface.SERVICE_CLASS_VOICE) > 0) {
-                                callForwardingInfo = new CallForwardingInfo(true,
+                                callForwardingInfo = new CallForwardingInfo(
+                                        callForwardInfo.status
+                                                == CommandsInterface.CF_ACTION_ENABLE,
                                         callForwardInfo.reason,
                                         callForwardInfo.number,
                                         callForwardInfo.timeSeconds);