Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Id4dd10573a5dc683792af74ead86513b2e3eae12
This commit is contained in:
Calvin Pan
2021-09-15 15:05:12 +00:00
committed by Automerger Merge Worker
parent a112ad6824 56754f7031
commit 91dc01ef1c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -14302,7 +14302,8 @@ public class TelephonyManager {
if (callForwardingInfo.getNumber() == null) { if (callForwardingInfo.getNumber() == null) {
throw new IllegalArgumentException("callForwarding number is 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"); throw new IllegalArgumentException("callForwarding timeout isn't positive");
} }
} }