summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchen xu <fionaxu@google.com>2019-03-11 15:33:53 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-11 15:33:53 -0700
commitee96f451881a308be4856ea96c7eba43a487ab3d (patch)
treeb32ca32feb82825d688ca1d3fd88cfaa5c23c48d
parent69ab0013640bf24dcbd7e699bb431dd5c3bb88af (diff)
parent0e2457d18057ce325fedaacad9b173d5cd4e8804 (diff)
downloadandroid_packages_apps_CarrierConfig-ee96f451881a308be4856ea96c7eba43a487ab3d.tar.gz
android_packages_apps_CarrierConfig-ee96f451881a308be4856ea96c7eba43a487ab3d.tar.bz2
android_packages_apps_CarrierConfig-ee96f451881a308be4856ea96c7eba43a487ab3d.zip
rename precise carrier id to specific carrier id am: 1a1f52ec6f
am: 0e2457d180 Change-Id: I8b923e7e3f49c2c6f84f3649e3b56bc24eb0ee9a
-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 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.