From 3bf80c66ff5b34c7387c0f3090d4fc3941c85019 Mon Sep 17 00:00:00 2001
From: Calvin Pan <calvinpan@google.com>
Date: Thu, 12 Aug 2021 20:53:48 +0800
Subject: [PATCH] Remove unnecessary condition

The call forward timer is only valid for the CF_REASON_NO_REPLY reason,
and it will be 0 in other cases. Remove the condition to prevent disable
processing not working.

Bug: 194112447
Test: Build pass
Change-Id: I824a61383b595284ee5694fcd31e58e2379997fb
---
 .../sim/smartForwarding/DisableSmartForwardingTask.java      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/sim/smartForwarding/DisableSmartForwardingTask.java b/src/com/android/settings/sim/smartForwarding/DisableSmartForwardingTask.java
index 45333ec7bcb..7826522715d 100644
--- a/src/com/android/settings/sim/smartForwarding/DisableSmartForwardingTask.java
+++ b/src/com/android/settings/sim/smartForwarding/DisableSmartForwardingTask.java
@@ -43,9 +43,8 @@ public class DisableSmartForwardingTask implements Runnable {
             }
 
             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);
             }
         }