summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchen xu <fionaxu@google.com>2019-03-06 15:27:06 -0800
committerchen xu <fionaxu@google.com>2019-03-06 15:27:06 -0800
commit76c927adb21d07475babe3b3867c8d31071beff1 (patch)
treeadde2ab55a90a22fd311d376d416bce398a2494f
parent0bd5b7b6c9e7b543f66884e968af71881785894d (diff)
downloadandroid_packages_apps_CarrierConfig-76c927adb21d07475babe3b3867c8d31071beff1.tar.gz
android_packages_apps_CarrierConfig-76c927adb21d07475babe3b3867c8d31071beff1.tar.bz2
android_packages_apps_CarrierConfig-76c927adb21d07475babe3b3867c8d31071beff1.zip
rename precise carrier id to specific carrier id
Bug: 126727010 Test: atest CtsTelephonyTestCases Change-Id: I32c0948ab47dc34df9ed791c18d6ff79158c400a
-rw-r--r--src/com/android/carrierconfig/DefaultCarrierConfigService.java16
1 files changed, 8 insertions, 8 deletions
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.