commit 2222617075eb3fca0c04ab088e9a523d3bd48400
author Grace Jia <xiaotonj@google.com> Tue Oct 26 21:31:09 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 26 21:31:09 2021 +0000
tree 013cbb875bf196aa2c81a9f8c9d4be4366a7d5fe
parent 8ecde2ba35e0098e65b2e3f70c1108f5427f0b1b
parent 69cc1411ecf74bb9c7f68699f1b0b5c95b0183f9

Merge "Set actual call forwarding enable status"

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);