rename precise carrier id to specific carrier id
Bug: 126727010
Test: atest CtsTelephonyTestCases
Change-Id: I819166fb748095e05e56de598395b40382af05f7
(cherry picked from commit 0026ca609e2044cc835f4cb8cfede2e83f669bf0)
Merged-in: I819166fb748095e05e56de598395b40382af05f7
diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 1e9e286..137d3d1 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -532,8 +532,8 @@
if (addSubIdExtra && (simApplicationState != TelephonyManager.SIM_STATE_UNKNOWN
&& simApplicationState != TelephonyManager.SIM_STATE_NOT_READY)) {
SubscriptionManager.putPhoneIdAndSubIdExtra(intent, phoneId);
- intent.putExtra(TelephonyManager.EXTRA_PRECISE_CARRIER_ID,
- getPreciseCarrierIdForPhoneId(phoneId));
+ intent.putExtra(TelephonyManager.EXTRA_SPECIFIC_CARRIER_ID,
+ getSpecificCarrierIdForPhoneId(phoneId));
intent.putExtra(TelephonyManager.EXTRA_CARRIER_ID, getCarrierIdForPhoneId(phoneId));
}
intent.putExtra(CarrierConfigManager.EXTRA_SLOT_INDEX, phoneId);
@@ -564,7 +564,7 @@
String spn = TelephonyManager.from(mContext).getSimOperatorNameForPhone(phoneId);
String simOperator = TelephonyManager.from(mContext).getSimOperatorNumericForPhone(phoneId);
int carrierId = TelephonyManager.UNKNOWN_CARRIER_ID;
- int preciseCarrierId = TelephonyManager.UNKNOWN_CARRIER_ID;
+ int specificCarrierId = TelephonyManager.UNKNOWN_CARRIER_ID;
// A valid simOperator should be 5 or 6 digits, depending on the length of the MNC.
if (simOperator != null && simOperator.length() >= 3) {
mcc = simOperator.substring(0, 3);
@@ -576,9 +576,9 @@
gid1 = phone.getGroupIdLevel1();
gid2 = phone.getGroupIdLevel2();
carrierId = phone.getCarrierId();
- preciseCarrierId = phone.getPreciseCarrierId();
+ specificCarrierId = phone.getSpecificCarrierId();
}
- return new CarrierIdentifier(mcc, mnc, spn, imsi, gid1, gid2, carrierId, preciseCarrierId);
+ return new CarrierIdentifier(mcc, mnc, spn, imsi, gid1, gid2, carrierId, specificCarrierId);
}
/** Returns the package name of a priveleged carrier app, or null if there is none. */
@@ -605,9 +605,9 @@
}
/**
- * Get the sim precise carrier id {@link TelephonyManager#getSimPreciseCarrierId()}
+ * Get the sim specific carrier id {@link TelephonyManager#getSimSpecificCarrierId()}
*/
- private int getPreciseCarrierIdForPhoneId(int phoneId) {
+ private int getSpecificCarrierIdForPhoneId(int phoneId) {
if (!SubscriptionManager.isValidPhoneId(phoneId)) {
return TelephonyManager.UNKNOWN_CARRIER_ID;
}
@@ -615,7 +615,7 @@
if (phone == null) {
return TelephonyManager.UNKNOWN_CARRIER_ID;
}
- return phone.getPreciseCarrierId();
+ return phone.getSpecificCarrierId();
}
/**
@@ -636,7 +636,7 @@
* Writes a bundle to an XML file.
*
* The bundle will be written to a file named after the package name, ICCID and
- * precise carrier id {@link TelephonyManager#getSimPreciseCarrierId()}. the same carrier
+ * specific carrier id {@link TelephonyManager#getSimSpecificCarrierId()}. the same carrier
* should have a single copy of XML file named after carrier id. However, it's still possible
* that platform doesn't recognize the current sim carrier, we will use iccid + carrierid as
* the canonical file name. carrierid can also handle the cases SIM OTA resolves to different
@@ -659,7 +659,7 @@
}
final String iccid = getIccIdForPhoneId(phoneId);
- final int cid = getPreciseCarrierIdForPhoneId(phoneId);
+ final int cid = getSpecificCarrierIdForPhoneId(phoneId);
if (packageName == null || iccid == null) {
loge("Cannot save config with null packageName or iccid.");
return;
@@ -734,7 +734,7 @@
}
final String iccid = getIccIdForPhoneId(phoneId);
- final int cid = getPreciseCarrierIdForPhoneId(phoneId);
+ final int cid = getSpecificCarrierIdForPhoneId(phoneId);
if (packageName == null || iccid == null) {
loge("Cannot restore config with null packageName or iccid.");
return null;
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index fd484f0..46f99e2 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2212,23 +2212,23 @@
}
@Override
- public int getSubscriptionPreciseCarrierId(int subId) {
+ public int getSubscriptionSpecificCarrierId(int subId) {
final long identity = Binder.clearCallingIdentity();
try {
final Phone phone = getPhone(subId);
return phone == null ? TelephonyManager.UNKNOWN_CARRIER_ID
- : phone.getPreciseCarrierId();
+ : phone.getSpecificCarrierId();
} finally {
Binder.restoreCallingIdentity(identity);
}
}
@Override
- public String getSubscriptionPreciseCarrierName(int subId) {
+ public String getSubscriptionSpecificCarrierName(int subId) {
final long identity = Binder.clearCallingIdentity();
try {
final Phone phone = getPhone(subId);
- return phone == null ? null : phone.getPreciseCarrierName();
+ return phone == null ? null : phone.getSpecificCarrierName();
} finally {
Binder.restoreCallingIdentity(identity);
}