commit fb7c74cbf35ca04d4e35ea43d37660ac54933f3a
author Sarah Chin <sarahchin@google.com> Thu Sep 29 23:57:46 2022 -0700
committer Sarah Chin <sarahchin@google.com> Fri Sep 30 20:20:26 2022 +0000
tree d590163a948f78fdbdbd37df39543915bc750bae
parent 94bd703e56c4cd80d4adb3553c448005e813db28

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

diff --git a/telephony/java/android/telephony/AccessNetworkConstants.java b/telephony/java/android/telephony/AccessNetworkConstants.java
index 7eec86a..0fdf40d 100644
--- a/telephony/java/android/telephony/AccessNetworkConstants.java
+++ b/telephony/java/android/telephony/AccessNetworkConstants.java
@@ -23,6 +23,7 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.Locale;
 
 /**
  * Contains access network related constants.
@@ -114,7 +115,7 @@
 
         /** @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;