diff options
| author | Meng Wang <mewan@google.com> | 2016-12-07 15:58:08 -0800 |
|---|---|---|
| committer | Meng Wang <mewan@google.com> | 2016-12-07 15:59:46 -0800 |
| commit | 378f2098bdb4de6eed1d623ea5aa418cc9f077a1 (patch) | |
| tree | 7fc21f4544ade46453ce1db42e3944c6593a9f24 /src | |
| parent | 5ad63bf6af425b1719a7341c632da91caa5b4fe3 (diff) | |
| parent | 0665760d783c9ce7688359030ea2530e8c1ebb0a (diff) | |
| download | android_packages_apps_CarrierConfig-378f2098bdb4de6eed1d623ea5aa418cc9f077a1.tar.gz android_packages_apps_CarrierConfig-378f2098bdb4de6eed1d623ea5aa418cc9f077a1.tar.bz2 android_packages_apps_CarrierConfig-378f2098bdb4de6eed1d623ea5aa418cc9f077a1.zip | |
resolve merge conflicts of 0665760 to nyc-mr2-dev-plus-aosp
Change-Id: Ie7609c96b7605f1b08bf073b2676729582b83e0a
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/carrierconfig/DefaultCarrierConfigService.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/carrierconfig/DefaultCarrierConfigService.java b/src/com/android/carrierconfig/DefaultCarrierConfigService.java index c4c6431..b82cce6 100644 --- a/src/com/android/carrierconfig/DefaultCarrierConfigService.java +++ b/src/com/android/carrierconfig/DefaultCarrierConfigService.java @@ -187,10 +187,10 @@ public class DefaultCarrierConfigService extends CarrierService { result = result && value.equals(id.getMnc()); break; case "gid1": - result = result && value.equals(id.getGid1()); + result = result && value.equalsIgnoreCase(id.getGid1()); break; case "gid2": - result = result && value.equals(id.getGid2()); + result = result && value.equalsIgnoreCase(id.getGid2()); break; case "spn": result = result && matchOnSP(value, id); @@ -199,7 +199,7 @@ public class DefaultCarrierConfigService extends CarrierService { result = result && matchOnImsi(value, id); break; case "device": - result = result && value.equals(Build.DEVICE); + result = result && value.equalsIgnoreCase(Build.DEVICE); break; default: Log.e(TAG, "Unknown attribute " + attribute + "=" + value); @@ -225,7 +225,7 @@ public class DefaultCarrierConfigService extends CarrierService { String currentImsi = id.getImsi(); // If we were able to retrieve current IMSI, see if it matches. if (currentImsi != null) { - Pattern imsiPattern = Pattern.compile(xmlImsi); + Pattern imsiPattern = Pattern.compile(xmlImsi, Pattern.CASE_INSENSITIVE); Matcher matcher = imsiPattern.matcher(currentImsi); matchFound = matcher.matches(); } @@ -249,7 +249,7 @@ public class DefaultCarrierConfigService extends CarrierService { matchFound = true; } } else if (currentSP != null) { - Pattern spPattern = Pattern.compile(xmlSP); + Pattern spPattern = Pattern.compile(xmlSP, Pattern.CASE_INSENSITIVE); Matcher matcher = spPattern.matcher(currentSP); matchFound = matcher.matches(); } |