Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'."
diff --git a/assets/eri_311480.xml b/assets/eri_311480.xml
index 750b200..c5e8624 100644
--- a/assets/eri_311480.xml
+++ b/assets/eri_311480.xml
@@ -58,7 +58,7 @@
<EriInfo RoamingIndicator="64"
IconIndex="1"
IconMode="0"
- EriText="Verizon Wireless"
+ EriText="Verizon"
CallPromptId="0"
AlertId="0"
DataServiceSupport="1"/>
@@ -154,7 +154,7 @@
<EriInfo RoamingIndicator="76"
IconIndex="0"
IconMode="0"
- EriText="Verizon Wireless"
+ EriText="Verizon"
CallPromptId="0"
AlertId="0"
DataServiceSupport="1"/>
@@ -162,7 +162,7 @@
<EriInfo RoamingIndicator="77"
IconIndex="2"
IconMode="0"
- EriText="Verizon Wireless"
+ EriText="Verizon"
CallPromptId="0"
AlertId="0"
DataServiceSupport="1"/>
diff --git a/res/values/config.xml b/res/values/config.xml
index 1f23c6b..bd0ed10 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -218,4 +218,7 @@
<!-- Whether the emergency only account can make emergency calls -->
<bool name="config_pstnCanPlaceEmergencyCalls">true</bool>
+
+ <!-- The package name for the platform carrier config app, bundled with system image. -->
+ <string name="platform_carrier_config_package" translatable="false">com.android.carrierconfig</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6701fec..ab01a0e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -20,7 +20,7 @@
and other settings UIs. This is the version of the label for
tablet devices, where the phone app handles mobile data but not
actual phone calls. -->
- <string name="phoneAppLabel" product="tablet">Cellular Data</string>
+ <string name="phoneAppLabel" product="tablet">Mobile Data</string>
<!-- Official label of the phone app, as seen in "Manage Applications"
and other settings UIs. -->
@@ -96,7 +96,7 @@
<!-- Button label on the "Missing voicemail number" dialog -->
<string name="add_vm_number_str">Add number</string>
<!--Toast in Call settings when asked to launch voicemail for a guest user -->
- <string name="voice_number_setting_primary_user_only">Voice mail for Call settings can only be changed by the primary user.</string>
+ <string name="voice_number_setting_primary_user_only">Voicemail Settings can only be modified by the Primary User.</string>
<!-- Status message displayed on SIM PIN unlock panel -->
<string name="puk_unlocked">Your SIM card has been unblocked. Your phone is unlocking\u2026</string>
@@ -117,7 +117,7 @@
<!-- settings strings -->
<!-- Error message for users that aren't allowed to modify Mobile Network settings [CHAR LIMIT=none] -->
- <string name="mobile_network_settings_not_available">Cellular network settings are not available for this user</string>
+ <string name="mobile_network_settings_not_available">Mobile network settings are not available for this user</string>
<!-- GSM Call settings screen, setting option name. [CHAR LIMIT=40] -->
<string name="labelGSMMore">GSM call settings</string>
<!-- GSM Call settings screen, setting option name with label indicating the SIM the settings
@@ -255,7 +255,7 @@
<!-- Call forwarding settings screen, setting summary text when forwarding to a specific number when unreachable-->
<string name="sum_cfnrc_enabled">Forwarding to <xliff:g id="phonenumber" example="555-1212">{0}</xliff:g></string>
<!-- Call forwarding settings screen, setting summary text when Forward when unreachable is disabled -->
- <string name="sum_cfnrc_disabled">Disabled</string>
+ <string name="sum_cfnrc_disabled">Off</string>
<!-- Error message displayed after failing to disable forwarding calls when the phone is unreachable -->
<string name="disable_cfnrc_forbidden">Your carrier doesn\'t support disabling call forwarding when your phone is unreachable.</string>
@@ -356,7 +356,7 @@
<!-- networks setting strings --><skip/>
<!-- Mobile network settings screen title -->
- <string name="mobile_networks">Cellular network settings</string>
+ <string name="mobile_networks">Mobile network settings</string>
<!-- Available networks screen title/heading -->
<string name="label_available">Available networks</string>
<!-- Mobile network settings screen, toast when searching for available networks -->
@@ -452,11 +452,11 @@
<item>"1"</item>
<item>"0"</item>
</string-array>
- <!-- Cellular network 4G title [CHAR LIMIT=30] -->
+ <!-- Mobile network 4G title [CHAR LIMIT=30] -->
<string name="enhanced_4g_lte_mode_title">Enhanced 4G LTE Mode</string>
<!-- Carrier variant of Enhaced 4G LTE Mode title. [CHAR LIMIT=50] -->
<string name="enhanced_4g_lte_mode_title_variant">Advanced Calling</string>
- <!-- Cellular network 4G summary [CHAR LIMIT=80] -->
+ <!-- Mobile network 4G summary [CHAR LIMIT=80] -->
<string name="enhanced_4g_lte_mode_summary">Use LTE services to improve voice and other communications (recommended)</string>
<!-- Mobile network settings screen, data enabling checkbox name -->
@@ -507,7 +507,7 @@
<string name="throttle_rate_subtext">Data rate reduced to <xliff:g id="used">%1$d</xliff:g> Kb/s if data use limit is exceeded</string>
- <string name="throttle_help_subtext">More information about your carrier\'s cellular network data use policy</string>
+ <string name="throttle_help_subtext">More information about your carrier\'s mobile network data use policy</string>
<string name="cell_broadcast_sms">Cell Broadcast SMS</string>
@@ -992,9 +992,9 @@
This string is currently unused (see comments in InCallScreen.java.) -->
<string name="incall_error_emergency_only">Not registered on network.</string>
<!-- In-call screen: call failure message displayed in an error dialog -->
- <string name="incall_error_out_of_service">Cellular network not available.</string>
+ <string name="incall_error_out_of_service">Mobile network not available.</string>
<!-- In-call screen: call failure message displayed in an error dialog -->
- <string name="incall_error_out_of_service_wfc">Cellular network is not available. Connect to a wireless network to make a call.</string>
+ <string name="incall_error_out_of_service_wfc">Mobile network is not available. Connect to a wireless network to make a call.</string>
<!-- In-call screen: call failure message displayed in an error dialog -->
<string name="incall_error_no_phone_number_supplied">To place a call, enter a valid number.</string>
<!-- In-call screen: call failure message displayed in an error dialog -->
diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 47bb064..357b470 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -83,8 +83,9 @@
public class CarrierConfigLoader extends ICarrierConfigLoader.Stub {
private static final String LOG_TAG = "CarrierConfigLoader";
- // Package name for default carrier config app, bundled with system image.
- private static final String DEFAULT_CARRIER_CONFIG_PACKAGE = "com.android.carrierconfig";
+
+ // Package name for platform carrier config app, bundled with system image.
+ private final String mPlatformCarrierConfigPackage;
/** The singleton instance. */
private static CarrierConfigLoader sInstance;
@@ -196,16 +197,16 @@
case EVENT_FETCH_DEFAULT:
iccid = getIccIdForPhoneId(phoneId);
- config = restoreConfigFromXml(DEFAULT_CARRIER_CONFIG_PACKAGE, iccid);
+ config = restoreConfigFromXml(mPlatformCarrierConfigPackage, iccid);
if (config != null) {
- log("Loaded config from XML. package=" + DEFAULT_CARRIER_CONFIG_PACKAGE
+ log("Loaded config from XML. package=" + mPlatformCarrierConfigPackage
+ " phoneId=" + phoneId);
mConfigFromDefaultApp[phoneId] = config;
Message newMsg = obtainMessage(EVENT_LOADED_FROM_DEFAULT, phoneId, -1);
newMsg.getData().putBoolean("loaded_from_xml", true);
mHandler.sendMessage(newMsg);
} else {
- if (bindToConfigPackage(DEFAULT_CARRIER_CONFIG_PACKAGE,
+ if (bindToConfigPackage(mPlatformCarrierConfigPackage,
phoneId, EVENT_CONNECTED_TO_DEFAULT)) {
sendMessageDelayed(obtainMessage(EVENT_BIND_DEFAULT_TIMEOUT, phoneId, -1),
BIND_TIMEOUT_MILLIS);
@@ -230,7 +231,7 @@
.asInterface(conn.service);
config = carrierService.getCarrierConfig(carrierId);
iccid = getIccIdForPhoneId(phoneId);
- saveConfigToXml(DEFAULT_CARRIER_CONFIG_PACKAGE, iccid, config);
+ saveConfigToXml(mPlatformCarrierConfigPackage, iccid, config);
mConfigFromDefaultApp[phoneId] = config;
sendMessage(obtainMessage(EVENT_LOADED_FROM_DEFAULT, phoneId, -1));
} catch (Exception ex) {
@@ -349,6 +350,8 @@
*/
private CarrierConfigLoader(Context context) {
mContext = context;
+ mPlatformCarrierConfigPackage =
+ mContext.getString(R.string.platform_carrier_config_package);
IntentFilter bootFilter = new IntentFilter();
bootFilter.addAction(Intent.ACTION_BOOT_COMPLETED);
