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

Merge "Clean cherry-pick 'Fix getApnTypesBitmaskFromString in ApnSetting'"

Browse Source 
am: 56dedc8fe8

Change-Id: I5be733e8edf4a07840b1d87ab295be606fbbadbb
This commit is contained in:
Cassie Han
2018-10-04 13:51:56 -07:00
committed by android-build-merger
parent c92bc64385 56dedc8fe8
commit 086476e72e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/java/android/telephony/data/ApnSetting.java
View File

@@ -1206,7 +1206,8 @@ public class ApnSetting implements Parcelable {
/** @hide */ /** @hide */
public static int getMvnoTypeIntFromString(String mvnoType) { public static int getMvnoTypeIntFromString(String mvnoType) {
Integer mvnoTypeInt = MVNO_TYPE_STRING_MAP.get(mvnoType); String mvnoTypeString = TextUtils.isEmpty(mvnoType) ? mvnoType : mvnoType.toLowerCase();
Integer mvnoTypeInt = MVNO_TYPE_STRING_MAP.get(mvnoTypeString);
return mvnoTypeInt == null ? UNSPECIFIED_INT : mvnoTypeInt; return mvnoTypeInt == null ? UNSPECIFIED_INT : mvnoTypeInt;
} }