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

Commit fffe3da1 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Fix locale bug for string conversions" into tm-qpr-dev am: aa6e5978 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20088011



Change-Id: If0fc5afb8fd97ce1c0c4de5462d5bd437496063e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6991102f aa6e5978

telephony/java/android/telephony/AccessNetworkConstants.java

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.hardware.radio.V1_5.AccessNetwork; 


import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.Locale;



/**

 * Contains access network related constants.
@@ -114,7 +115,7 @@ public final class AccessNetworkConstants { 


        /** @hide */

        public static @RadioAccessNetworkType int fromString(@NonNull String str) {

            switch (str.toUpperCase()) {

            switch (str.toUpperCase(Locale.ROOT)) {

                case "UNKNOWN": return UNKNOWN;

                case "GERAN": return GERAN;

                case "UTRAN": return UTRAN;