diff options
| author | 2022-10-01 06:02:25 +0000 | |
|---|---|---|
| committer | 2022-10-01 06:02:25 +0000 | |
| commit | fffe3da101f3b4f91523f143394a8766190d8cb4 (patch) | |
| tree | 545fba4573398acfb365f8648d7b550e019f6d78 /telephony | |
| parent | 6991102f420094248b9961b2cf20a673115169ed (diff) | |
| parent | aa6e5978560d0f098b584f7db0c0dbc9efd60486 (diff) | |
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>
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/AccessNetworkConstants.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/AccessNetworkConstants.java b/telephony/java/android/telephony/AccessNetworkConstants.java index 7eec86a40c13..0fdf40d99c94 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; |