diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index e21d0ad0908c6..b2ea79f1ca9cc 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -14298,7 +14298,8 @@ public class TelephonyManager { if (callForwardingInfo.getNumber() == null) { throw new IllegalArgumentException("callForwarding number is null"); } - if (callForwardingInfo.getTimeoutSeconds() <= 0) { + if (callForwardingReason == CallForwardingInfo.REASON_NO_REPLY + && callForwardingInfo.getTimeoutSeconds() <= 0) { throw new IllegalArgumentException("callForwarding timeout isn't positive"); } }