commit 720fd136ed11483f8d81e2378221481a8017eb85
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Jul 26 04:03:19 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 26 04:03:19 2023 +0000
tree 0cd5ceee76771e4cf53abe48e61e4f9e86bb2874
parent 24db817a65ee96ed4631d453c0cfe55088bf3c59
parent 8bce735fa0dfa9bd4089277139a2ca675acd9329

Merge "Match APN types with ignoring the case" into main

src/com/android/settings/network/apn/ApnEditor.java

diff --git a/src/com/android/settings/network/apn/ApnEditor.java b/src/com/android/settings/network/apn/ApnEditor.java
index 25d8e84..a66a33f 100644
--- a/src/com/android/settings/network/apn/ApnEditor.java
+++ b/src/com/android/settings/network/apn/ApnEditor.java
@@ -429,15 +429,20 @@
             return false;
         }
 
-        if (hasAllApns(apnTypesArray1) || TextUtils.isEmpty(apnTypes2)) {
+        final String[] apnTypesArray1LowerCase = new String[apnTypesArray1.length];
+        for (int i = 0; i < apnTypesArray1.length; i++) {
+            apnTypesArray1LowerCase[i] = apnTypesArray1[i].toLowerCase();
+        }
+
+        if (hasAllApns(apnTypesArray1LowerCase) || TextUtils.isEmpty(apnTypes2)) {
             return true;
         }
 
-        final List apnTypesList1 = Arrays.asList(apnTypesArray1);
+        final List apnTypesList1 = Arrays.asList(apnTypesArray1LowerCase);
         final String[] apnTypesArray2 = apnTypes2.split(",");
 
         for (String apn : apnTypesArray2) {
-            if (apnTypesList1.contains(apn.trim())) {
+            if (apnTypesList1.contains(apn.trim().toLowerCase())) {
                 Log.d(TAG, "apnTypesMatch: true because match found for " + apn.trim());
                 return true;
             }