diff options
| author | Meng Wang <mewan@google.com> | 2016-11-17 10:38:23 -0800 |
|---|---|---|
| committer | Meng Wang <mewan@google.com> | 2016-11-22 05:56:33 +0000 |
| commit | 0665760d783c9ce7688359030ea2530e8c1ebb0a (patch) | |
| tree | 7bb73299b632061d93ac2516e5c1cf9bb70599ee | |
| parent | de939fe559ebf45f16d23ce92867d7b805736297 (diff) | |
| download | android_packages_apps_CarrierConfig-0665760d783c9ce7688359030ea2530e8c1ebb0a.tar.gz android_packages_apps_CarrierConfig-0665760d783c9ce7688359030ea2530e8c1ebb0a.tar.bz2 android_packages_apps_CarrierConfig-0665760d783c9ce7688359030ea2530e8c1ebb0a.zip | |
DO NOT MERGE: CarrierConfig: ignore case when comparing mvno
Follow the convention in ApnSetting where mnvo matching ignores case.
Bug: 32962509
Change-Id: Ifc6a9492505cab2821218c27f36a34dd6d892c86
| -rw-r--r-- | src/com/android/carrierconfig/DefaultCarrierConfigService.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/carrierconfig/DefaultCarrierConfigService.java b/src/com/android/carrierconfig/DefaultCarrierConfigService.java index 9081821..9009640 100644 --- a/src/com/android/carrierconfig/DefaultCarrierConfigService.java +++ b/src/com/android/carrierconfig/DefaultCarrierConfigService.java @@ -175,16 +175,16 @@ 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 && value.equals(id.getSpn()); + result = result && value.equalsIgnoreCase(id.getSpn()); break; case "device": - result = result && value.equals(Build.DEVICE); + result = result && value.equalsIgnoreCase(Build.DEVICE); break; default: Log.e(TAG, "Unknown attribute " + attribute + "=" + value); |