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

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

Change-Id: If0fc5afb8fd97ce1c0c4de5462d5bd437496063e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sarah Chin
2022-10-01 06:02:25 +00:00
committed by Automerger Merge Worker

View File

@@ -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;