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

Commit 9daf0f55 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 am: 91dc01ef

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

Change-Id: Iaad7fded4db28c8e941349baf5b6703f1c512179
parents a9d30578 91dc01ef

telephony/java/android/telephony/TelephonyManager.java

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

            }

        }