diff options
author | chen xu <fionaxu@google.com> | 2019-03-06 15:27:06 -0800 |
---|---|---|
committer | Chen Xu <fionaxu@google.com> | 2019-03-11 20:25:18 +0000 |
commit | 1a1f52ec6fbc830abf5082b3781066480cbcacee (patch) | |
tree | b32ca32feb82825d688ca1d3fd88cfaa5c23c48d | |
parent | f4b07f86d5f3baf7d29b4bcfe514508bf2548f1c (diff) | |
download | android_packages_apps_CarrierConfig-1a1f52ec6fbc830abf5082b3781066480cbcacee.tar.gz android_packages_apps_CarrierConfig-1a1f52ec6fbc830abf5082b3781066480cbcacee.tar.bz2 android_packages_apps_CarrierConfig-1a1f52ec6fbc830abf5082b3781066480cbcacee.zip |
rename precise carrier id to specific carrier id
Bug: 126727010
Test: atest CtsTelephonyTestCases
Change-Id: I32c0948ab47dc34df9ed791c18d6ff79158c400a
(cherry picked from commit 76c927adb21d07475babe3b3867c8d31071beff1)
Merged-in: I32c0948ab47dc34df9ed791c18d6ff79158c400a
-rw-r--r-- | src/com/android/carrierconfig/DefaultCarrierConfigService.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/com/android/carrierconfig/DefaultCarrierConfigService.java b/src/com/android/carrierconfig/DefaultCarrierConfigService.java index 2980332..b709040 100644 --- a/src/com/android/carrierconfig/DefaultCarrierConfigService.java +++ b/src/com/android/carrierconfig/DefaultCarrierConfigService.java @@ -85,14 +85,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"); @@ -103,9 +103,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()) { @@ -221,7 +221,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> * @@ -264,7 +264,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. |