commit abb8a6abdc96189c212c2d3ae76584ea76c1d156
author Calvin Pan <calvinpan@google.com> Wed Aug 18 06:43:59 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 18 06:43:59 2021 +0000
tree 04ea3531aeaf07e78c89a3a9e7f1b096864264bc
parent ebdc11188129917ac3b02c188b2f04b760185b38
parent 3bf80c66ff5b34c7387c0f3090d4fc3941c85019

Merge "Remove unnecessary condition" into sc-qpr1-dev

src/com/android/settings/sim/smartForwarding/DisableSmartForwardingTask.java

diff --git a/src/com/android/settings/sim/smartForwarding/DisableSmartForwardingTask.java b/src/com/android/settings/sim/smartForwarding/DisableSmartForwardingTask.java
index 45333ec..7826522 100644
--- a/src/com/android/settings/sim/smartForwarding/DisableSmartForwardingTask.java
+++ b/src/com/android/settings/sim/smartForwarding/DisableSmartForwardingTask.java
@@ -43,9 +43,8 @@
             }
 
             if (callForwardingInfo != null
-                    && callForwardingInfo[i] != null
-                    && callForwardingInfo[i].getTimeoutSeconds() > 0) {
-                Log.d(TAG, "Restore call waiting to " + callForwardingInfo);
+                    && callForwardingInfo[i] != null) {
+                Log.d(TAG, "Restore call forwarding to " + callForwardingInfo[i]);
                 tm.setCallForwarding(callForwardingInfo[i], null, null);
             }
         }