From 0665760d783c9ce7688359030ea2530e8c1ebb0a Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Thu, 17 Nov 2016 10:38:23 -0800 Subject: DO NOT MERGE: CarrierConfig: ignore case when comparing mvno Follow the convention in ApnSetting where mnvo matching ignores case. Bug: 32962509 Change-Id: Ifc6a9492505cab2821218c27f36a34dd6d892c86 --- src/com/android/carrierconfig/DefaultCarrierConfigService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/com') 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); -- cgit v1.2.3