Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07a945d9 authored by Dheeraj Shetty's avatar Dheeraj Shetty Committed by android-build-merger
Browse files

Merge "Fix APN build" am: d3d5d5a9 am: 53122f12 

am: 1a5a6327

Change-Id: I1e6a2330ee121d1439f0142982b4b11453cb841b
parents be9b24a5 1a5a6327

telephony/java/android/telephony/data/ApnSetting.java

+3 −2
Original line number Diff line number Diff line
@@ -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);