PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Match APN types with ignoring the case" into main am: 720fd136ed am: 9a44907d9e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056

Change-Id: If5c4c47dd5d1b05635e8d5102e52a58f5442a9da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-07-26 05:31:45 +00:00
committed by Automerger Merge Worker
parent faff4d6bea 9a44907d9e
commit 3d47657593
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/network/apn/ApnEditor.java
View File

@@ -435,15 +435,20 @@ public class ApnEditor extends SettingsPreferenceFragment
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;
}