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
This commit is contained in:
Cassie Han
2018-10-04 20:35:07 +00:00
committed by Gerrit Code Review
parent 8f08ba793e 5d2b861509
commit 56dedc8fe8
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.text.TextUtils;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.Log; import android.util.Log;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.net.InetAddress; import java.net.InetAddress;
@@ -1205,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;
} }