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

Clean cherry-pick 'Fix getApnTypesBitmaskFromString in ApnSetting'

Browse Source 
Bug: 116363528
Test: Maunal test
Change-Id: Ie2fda3fe4e2519f652e0a04dde058be748208bd5
Merged-In: Ie2fda3fe4e2519f652e0a04dde058be748208bd5
This commit is contained in:
Cassie
2018-09-28 17:35:47 -07:00
committed by Cassie Han
parent aff3248507
commit 5d2b861509
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@ import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.Log;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.net.InetAddress;
@@ -1205,7 +1206,8 @@ public class ApnSetting implements Parcelable {
/** @hide */
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;
}