Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 1a5a6327a5

Change-Id: I1e6a2330ee121d1439f0142982b4b11453cb841b
This commit is contained in:
Dheeraj Shetty
2019-11-06 12:04:12 -08:00
committed by android-build-merger
parent be9b24a52c 1a5a6327a5
commit 07a945d97b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/java/android/telephony/data/ApnSetting.java
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);