Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d2b8615 authored by Cassie's avatar Cassie Committed by Cassie Han
Browse files

Clean cherry-pick 'Fix getApnTypesBitmaskFromString in ApnSetting' 

Bug: 116363528
Test: Maunal test
Change-Id: Ie2fda3fe4e2519f652e0a04dde058be748208bd5
Merged-In: Ie2fda3fe4e2519f652e0a04dde058be748208bd5
parent aff32485

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

+3 −1
Original line number Diff line number Diff line
@@ -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;

    }