Fix APN build

ApnSetting builder does not consider non-wildcardable APNs. Add a new
type that includes all APNs.

Test: Manual
Bug: 142369363, 142829281
Change-Id:I38886aad2bc605f879816835c8b1499754b29c04
This commit is contained in:
Dheeraj Shetty
2019-10-25 15:16:19 -07:00
parent 7516db2ec2
commit 82280a6d10

View File

@@ -1944,8 +1944,9 @@ public class ApnSetting implements Parcelable {
* {@link ApnSetting} built from this builder otherwise.
*/
public ApnSetting build() {
if ((mApnTypeBitmask & TYPE_ALL) == 0 || TextUtils.isEmpty(mApnName)
|| TextUtils.isEmpty(mEntryName)) {
if ((mApnTypeBitmask & (TYPE_DEFAULT | TYPE_MMS | TYPE_SUPL | TYPE_DUN | TYPE_HIPRI |
TYPE_FOTA | TYPE_IMS | TYPE_CBS | TYPE_IA | TYPE_EMERGENCY | TYPE_MCX)) == 0
|| TextUtils.isEmpty(mApnName) || TextUtils.isEmpty(mEntryName)) {
return null;
}
return new ApnSetting(this);