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

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

Fix locale bug for string conversion am: 1288b573 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/20087074



Change-Id: Ie2c93ed5f2c7a351cbaf80748181fab4a0fc9729
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a64db9a7 1288b573

src/java/com/android/internal/telephony/data/DataConfigManager.java

+3 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import java.util.Arrays; 
import java.util.Collections;

import java.util.HashSet;

import java.util.List;

import java.util.Locale;

import java.util.Map;

import java.util.Set;

import java.util.concurrent.ConcurrentHashMap;
@@ -473,7 +474,8 @@ public class DataConfigManager extends Handler { 
                    CarrierConfigManager.KEY_TELEPHONY_NETWORK_CAPABILITY_PRIORITIES_STRING_ARRAY);

            if (capabilityPriorityStrings != null) {

                for (String capabilityPriorityString : capabilityPriorityStrings) {

                    capabilityPriorityString = capabilityPriorityString.trim().toUpperCase();

                    capabilityPriorityString =

                            capabilityPriorityString.trim().toUpperCase(Locale.ROOT);

                    String[] tokens = capabilityPriorityString.split(":");

                    if (tokens.length != 2) {

                        loge("Invalid config \"" + capabilityPriorityString + "\"");