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

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

Change-Id: I9fef74a954ee2ab03037e4c3abaa2539749f8d9e
This commit is contained in:
Calvin Pan
2021-08-18 07:05:33 +00:00
committed by Automerger Merge Worker

View File

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