From 82280a6d1072d67f76c8098fa4e20f58154cce66 Mon Sep 17 00:00:00 2001
From: Dheeraj Shetty <shettydheeraj@google.com>
Date: Fri, 25 Oct 2019 15:16:19 -0700
Subject: [PATCH] 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
---
 telephony/java/android/telephony/data/ApnSetting.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java
index a5d62669de052..60774e7f1e7f3 100644
--- a/telephony/java/android/telephony/data/ApnSetting.java
+++ b/telephony/java/android/telephony/data/ApnSetting.java
@@ -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);