Merge "Use carrierconfig instead of overlay to get USE_HFA_FOR_PROVISIONING and USE_OTASP_FOR_PROVISIONING." into mnc-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 260de24..e707c4e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1255,10 +1255,6 @@
<item>never</item>
</string-array>
- <!-- Setting option name to enable or disable dialpad autocomplete functionality
- [CHAR LIMIT=30] -->
- <string name="dial_pad_autocomplete">Dialpad autocomplete</string>
-
<!-- Title for the category "ringtone", which is shown above ringtone and vibration
related settings.
[CHAR LIMIT=30] -->
diff --git a/src/com/android/phone/settings/VoicemailSettingsActivity.java b/src/com/android/phone/settings/VoicemailSettingsActivity.java
index 27349fe..f017836 100644
--- a/src/com/android/phone/settings/VoicemailSettingsActivity.java
+++ b/src/com/android/phone/settings/VoicemailSettingsActivity.java
@@ -622,7 +622,8 @@
// In all dialogs, all buttons except BUTTON_POSITIVE lead to the end of user interaction
// with settings UI. If we were called to explicitly configure voice mail then
// we finish the settings activity here to come back to whatever the user was doing.
- if (getIntent().getAction().equals(ACTION_ADD_VOICEMAIL)) {
+ final String action = getIntent() != null ? getIntent().getAction() : null;
+ if (ACTION_ADD_VOICEMAIL.equals(action)) {
finish();
}
}
diff --git a/src/com/android/phone/vvm/omtp/SimChangeReceiver.java b/src/com/android/phone/vvm/omtp/SimChangeReceiver.java
index e607d60..ec8e45e 100644
--- a/src/com/android/phone/vvm/omtp/SimChangeReceiver.java
+++ b/src/com/android/phone/vvm/omtp/SimChangeReceiver.java
@@ -65,8 +65,8 @@
private void handleCarrierConfigChange(Context context, Intent intent) {
int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
- if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
- Log.w(TAG, "subscriptionId not provided in intent.");
+ if (!SubscriptionManager.isValidSubscriptionId(subId)) {
+ Log.w(TAG, "Invalid subscriptionId or subscriptionId not provided in intent.");
return;
}