| commit | 327c509933f37d95e408141203008914551408af | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <[email protected]> | Tue Mar 01 23:41:33 2022 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Tue Mar 01 23:41:33 2022 +0000 |
| tree | a23d3cb3d7450c7e65719e15be4c51a0d8abebb0 | |
| parent | 7c11e556971ea43943083aa56376cf6008f59d4e [diff] | |
| parent | 53f21f4aaec7bd3e1e7b3ff343ab24b23370cba9 [diff] |
Merge "Reverted the ApnSetting behavior" am: 88b3357538 am: 53f21f4aae Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004910 Change-Id: I442a38e34358715cee1033f1a955cc0a474f163e
diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java index d6dce25..8c02ffe 100644 --- a/telephony/java/android/telephony/data/ApnSetting.java +++ b/telephony/java/android/telephony/data/ApnSetting.java
@@ -2158,8 +2158,7 @@ | TYPE_FOTA | TYPE_IMS | TYPE_CBS | TYPE_IA | TYPE_EMERGENCY | TYPE_MCX | TYPE_XCAP | TYPE_VSIM | TYPE_BIP | TYPE_ENTERPRISE)) == 0 || TextUtils.isEmpty(mApnName) || TextUtils.isEmpty(mEntryName)) { - throw new IllegalArgumentException("mApName=" + mApnName + ", mEntryName=" - + mEntryName + ", mApnTypeBitmask=" + mApnTypeBitmask); + return null; } return new ApnSetting(this); }