commit 82280a6d1072d67f76c8098fa4e20f58154cce66
author Dheeraj Shetty <shettydheeraj@google.com> Fri Oct 25 15:16:19 2019 -0700
committer Dheeraj Shetty <shettydheeraj@google.com> Tue Nov 05 13:53:25 2019 -0800
tree 1f405365ecffce901b1cb44d10757d8282b0e8be
parent 7516db2ec285ea28561023610569109ea8d09215

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

diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java
index a5d6266..60774e7 100644
--- a/telephony/java/android/telephony/data/ApnSetting.java
+++ b/telephony/java/android/telephony/data/ApnSetting.java
@@ -1944,8 +1944,9 @@
          * {@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);