Merge "Check the timeout only the reason is CF_REASON_NO_REPLY" into sc-qpr1-dev

2021-09-14 14:06:59 +00:00
parent ae5181cd41 f7e9afbea4
commit fcf06e22b7
1 changed files with 2 additions and 1 deletions
--- 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");
            }
        }