Merge "Reverted the ApnSetting behavior" am: 88b3357538

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

Change-Id: I8a47c3fff9df8fc7bd172e842fe1a38956bfb8e5
This commit is contained in:
Treehugger Robot
2022-03-01 23:18:18 +00:00
committed by Automerger Merge Worker

View File

@@ -2158,8 +2158,7 @@ public class ApnSetting implements Parcelable {
| TYPE_FOTA | TYPE_IMS | TYPE_CBS | TYPE_IA | TYPE_EMERGENCY | TYPE_MCX | TYPE_FOTA | TYPE_IMS | TYPE_CBS | TYPE_IA | TYPE_EMERGENCY | TYPE_MCX
| TYPE_XCAP | TYPE_VSIM | TYPE_BIP | TYPE_ENTERPRISE)) == 0 | TYPE_XCAP | TYPE_VSIM | TYPE_BIP | TYPE_ENTERPRISE)) == 0
|| TextUtils.isEmpty(mApnName) || TextUtils.isEmpty(mEntryName)) { || TextUtils.isEmpty(mApnName) || TextUtils.isEmpty(mEntryName)) {
throw new IllegalArgumentException("mApName=" + mApnName + ", mEntryName=" return null;
+ mEntryName + ", mApnTypeBitmask=" + mApnTypeBitmask);
} }
return new ApnSetting(this); return new ApnSetting(this);
} }