From 5d2b8615096508dc5dacdce92d96c037093b2950 Mon Sep 17 00:00:00 2001 From: Cassie Date: Fri, 28 Sep 2018 17:35:47 -0700 Subject: [PATCH] Clean cherry-pick 'Fix getApnTypesBitmaskFromString in ApnSetting' Bug: 116363528 Test: Maunal test Change-Id: Ie2fda3fe4e2519f652e0a04dde058be748208bd5 Merged-In: Ie2fda3fe4e2519f652e0a04dde058be748208bd5 --- telephony/java/android/telephony/data/ApnSetting.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java index 0e4a7addd58cf..951bed468eda3 100644 --- a/telephony/java/android/telephony/data/ApnSetting.java +++ b/telephony/java/android/telephony/data/ApnSetting.java @@ -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; }