diff options
| -rw-r--r-- | assets/carrier_config_carrierid_2032_XFINIY-Mobile.xml | 13 | ||||
| -rw-r--r-- | src/com/android/carrierconfig/DefaultCarrierConfigService.java | 16 |
2 files changed, 21 insertions, 8 deletions
diff --git a/assets/carrier_config_carrierid_2032_XFINIY-Mobile.xml b/assets/carrier_config_carrierid_2032_XFINIY-Mobile.xml index 958e076..e67b42d 100644 --- a/assets/carrier_config_carrierid_2032_XFINIY-Mobile.xml +++ b/assets/carrier_config_carrierid_2032_XFINIY-Mobile.xml @@ -101,6 +101,19 @@ <item value="-95"/> <item value="-85"/> </int-array> + <int-array name="cdma_enhanced_roaming_indicator_for_home_network_int_array" num="11"> + <item value="64"/> + <item value="65"/> + <item value="66"/> + <item value="76"/> + <item value="77"/> + <item value="78"/> + <item value="79"/> + <item value="80"/> + <item value="81"/> + <item value="82"/> + <item value="83"/> + </int-array> <int name="maxImageHeight" value="1944"/> <int name="maxImageWidth" value="2592"/> <int name="maxMessageSize" value="1258291"/> diff --git a/src/com/android/carrierconfig/DefaultCarrierConfigService.java b/src/com/android/carrierconfig/DefaultCarrierConfigService.java index d69722e..3458df4 100644 --- a/src/com/android/carrierconfig/DefaultCarrierConfigService.java +++ b/src/com/android/carrierconfig/DefaultCarrierConfigService.java @@ -79,14 +79,14 @@ public class DefaultCarrierConfigService extends CarrierService { XmlPullParser parser = mFactory.newPullParser(); if (id.getCarrierId() != TelephonyManager.UNKNOWN_CARRIER_ID) { PersistableBundle configByCarrierId = new PersistableBundle(); - PersistableBundle configByPreciseCarrierId = new PersistableBundle(); + PersistableBundle configBySpecificCarrierId = new PersistableBundle(); PersistableBundle configByMccMncFallBackCarrierId = new PersistableBundle(); int mccmncCarrierId = TelephonyManager.from(getApplicationContext()) .getCarrierIdFromMccMnc(id.getMcc() + id.getMnc()); for (String file : getApplicationContext().getAssets().list("")) { - if (file.startsWith(CARRIER_ID_PREFIX + id.getPreciseCarrierId() + "_")) { + if (file.startsWith(CARRIER_ID_PREFIX + id.getSpecificCarrierId() + "_")) { parser.setInput(getApplicationContext().getAssets().open(file), "utf-8"); - configByPreciseCarrierId = readConfigFromXml(parser, null); + configBySpecificCarrierId = readConfigFromXml(parser, null); break; } else if (file.startsWith(CARRIER_ID_PREFIX + id.getCarrierId() + "_")) { parser.setInput(getApplicationContext().getAssets().open(file), "utf-8"); @@ -97,9 +97,9 @@ public class DefaultCarrierConfigService extends CarrierService { } } - // priority: precise carrier id > carrier id > mccmnc fallback carrier id - if (!configByPreciseCarrierId.isEmpty()) { - config = configByPreciseCarrierId; + // priority: specific carrier id > carrier id > mccmnc fallback carrier id + if (!configBySpecificCarrierId.isEmpty()) { + config = configBySpecificCarrierId; } else if (!configByCarrierId.isEmpty()) { config = configByCarrierId; } else if (!configByMccMncFallBackCarrierId.isEmpty()) { @@ -215,7 +215,7 @@ public class DefaultCarrierConfigService extends CarrierService { * <li>imsi: {@link CarrierIdentifier#getImsi}</li> * <li>device: {@link Build.DEVICE}</li> * <li>cid: {@link CarrierIdentifier#getCarrierId()} - * or {@link CarrierIdentifier#getPreciseCarrierId()}</li> + * or {@link CarrierIdentifier#getSpecificCarrierId()}</li> * </ul> * </p> * @@ -258,7 +258,7 @@ public class DefaultCarrierConfigService extends CarrierService { break; case "cid": result = result && (value.equals(id.getCarrierId()) - || value.equals(id.getPreciseCarrierId())); + || value.equals(id.getSpecificCarrierId())); break; case "name": // name is used together with cid for readability. ignore for filter. |