Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 186ea2cd authored by Calvin Pan's avatar Calvin Pan Committed by Automerger Merge Worker
Browse files

Merge "Remove unnecessary condition" into sc-qpr1-dev am: abb8a6ab 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542134

Change-Id: I78ee6b2fb68ba44682e33cc6dbaaee6a64cba608
parents a395f188 abb8a6ab

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

+2 −3
Original line number Diff line number Diff line
@@ -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);

            }

        }