commit 56dedc8fe894dbf56ab07bdc366d8f596871ebd9
author Cassie Han <xih@google.com> Thu Oct 04 20:35:07 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 04 20:35:07 2018 +0000
tree c6e7bdabbbc9a67880b5ad7b96d0063c46533abb
parent 8f08ba793ed921e745a574f65dd04a8bfd286647
parent 5d2b8615096508dc5dacdce92d96c037093b2950

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

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

diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java
index 0e4a7ad..951bed4 100644
--- a/telephony/java/android/telephony/data/ApnSetting.java
+++ b/telephony/java/android/telephony/data/ApnSetting.java
@@ -31,6 +31,7 @@
 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 @@
 
     /** @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;
     }