commit 07a945d97bc49a57b7cc32abcceaadc3363a6e77
author Dheeraj Shetty <shettydheeraj@google.com> Wed Nov 06 12:04:12 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 06 12:04:12 2019 -0800
tree 2ba06b3873a5e91d91179fa01b3d4fd9a5f9968f
parent be9b24a52c9bc7f0bf5fe21883995f9f45dd15bc
parent 1a5a6327a5eecf2803cf49cc6a850bbd3e0ebda6

Merge "Fix APN build" am: d3d5d5a962 am: 53122f12b4
am: 1a5a6327a5

Change-Id: I1e6a2330ee121d1439f0142982b4b11453cb841b

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);