From f7e9afbea4d8ff41c97a6e8d1ff2f61365331c11 Mon Sep 17 00:00:00 2001 From: Calvin Pan Date: Mon, 13 Sep 2021 17:33:57 +0800 Subject: Check the timeout only the reason is CF_REASON_NO_REPLY The timeout in call forwarding is only valid for CF_REASON_NO_REPLY reason, so only check if reason is CF_REASON_NO_REPLY Bug: 194112447 Test: enable/disable call forwarding Change-Id: I290d5fa64f0a32ddcaf1f16c51b99f52e8e38913 --- telephony/java/android/telephony/TelephonyManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'telephony/java/android') diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index abab426b3252..d5be4f36145a 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -14302,7 +14302,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"); } } -- cgit v1.2.3