diff options
| author | Meng Wang <mewan@google.com> | 2016-12-07 23:37:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-07 23:37:14 +0000 |
| commit | dd8ae4ef01961f8ddd67b20afc731b76c9231b62 (patch) | |
| tree | 51cf8439375e2a98d357291bf52089871b0e206f | |
| parent | e3eaf0ed4e5f83300c0bb04a359ee0ec1f6ab388 (diff) | |
| parent | 0665760d783c9ce7688359030ea2530e8c1ebb0a (diff) | |
| download | android_packages_apps_CarrierConfig-dd8ae4ef01961f8ddd67b20afc731b76c9231b62.tar.gz android_packages_apps_CarrierConfig-dd8ae4ef01961f8ddd67b20afc731b76c9231b62.tar.bz2 android_packages_apps_CarrierConfig-dd8ae4ef01961f8ddd67b20afc731b76c9231b62.zip | |
Merge "DO NOT MERGE: CarrierConfig: ignore case when comparing mvno" into nyc-mr2-dev
| -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); |