From fb7c74cbf35ca04d4e35ea43d37660ac54933f3a Mon Sep 17 00:00:00 2001
From: Sarah Chin <sarahchin@google.com>
Date: Thu, 29 Sep 2022 23:57:46 -0700
Subject: [PATCH] Fix locale bug for string conversions

Use Locale.ROOT to be consistent with the constants.

Test: manual test with Turkish locale
Bug: 248068481
Change-Id: Ieb5678016e00e3b6d60b9d07bb08ccc5c0623f3d
---
 telephony/java/android/telephony/AccessNetworkConstants.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/telephony/java/android/telephony/AccessNetworkConstants.java b/telephony/java/android/telephony/AccessNetworkConstants.java
index 7eec86a40c130..0fdf40d99c94c 100644
--- a/telephony/java/android/telephony/AccessNetworkConstants.java
+++ b/telephony/java/android/telephony/AccessNetworkConstants.java
@@ -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;