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

Commit 91dc01ef authored by Calvin Pan's avatar Calvin Pan Committed by Automerger Merge Worker
Browse files

Merge "Check the timeout only the reason is CF_REASON_NO_REPLY" into... 

Merge "Check the timeout only the reason is CF_REASON_NO_REPLY" into sc-qpr1-dev am: fcf06e22 am: 56754f70

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15808956

Change-Id: Id4dd10573a5dc683792af74ead86513b2e3eae12
parents a112ad68 56754f70

telephony/java/android/telephony/TelephonyManager.java

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

            }

        }