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 am: 91dc01ef1c

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

Change-Id: Iaad7fded4db28c8e941349baf5b6703f1c512179
This commit is contained in:
Calvin Pan
2021-09-15 15:12:58 +00:00
committed by Automerger Merge Worker
parent a9d3057886 91dc01ef1c
commit 9daf0f55ad
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

@@ -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");
}
}