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

Commit 5d82f62b authored by Cassie Han's avatar Cassie Han Committed by android-build-merger
Browse files

Merge "Clean cherry-pick 'Fix getApnTypesBitmaskFromString in ApnSetting'" am: 56dedc8f 

am: 086476e7

Change-Id: I12868c85b5645b84097566a936d7692ddb6fdcb7
parents 3cd0616f 086476e7

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

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

    }