Merge "Add a check to see if a call has been disconnected" into nyc-dev
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index b0517ae..8c3adbe 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -22,7 +22,7 @@
<string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
<string name="fdnListLabel" msgid="8630418672279521003">"Ruxsat etilgan raqamlar"</string>
<string name="unknown" msgid="6878797917991465859">"Noma’lum"</string>
- <string name="private_num" msgid="6713286113000232309">"Shaxsiy raqam"</string>
+ <string name="private_num" msgid="6713286113000232309">"Yashirin raqam"</string>
<string name="payphone" msgid="4793877574636445118">"Taksofon"</string>
<string name="onHold" msgid="9035493194749959955">"Kutmoqda"</string>
<string name="mmiStarted" msgid="6347869857061147003">"MMI kodi ishga tushirildi"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b054110..d49a0a6 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -559,7 +559,7 @@
<string name="accessibility_settings_activity_title" msgid="8562004288733103868">"協助工具"</string>
<string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Wi-Fi 來電"</string>
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi 通話"</string>
- <string name="emergency_action_launch_hint" msgid="4906759256275562674">"再次輕按即可開啟"</string>
+ <string name="emergency_action_launch_hint" msgid="4906759256275562674">"再次輕觸即可開啟"</string>
<string name="message_decode_error" msgid="3456481534066924855">"為郵件解碼時發生錯誤。"</string>
<string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM 卡已啟用您的服務並更新了手機的漫遊功能。"</string>
<string name="callFailed_cdma_call_limit" msgid="1556916577171457086">"進行中的通話過多。請先結束或合併現有通話，再撥打新的電話。"</string>
diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index e87b9a7..4dd7d0b 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -2416,7 +2416,7 @@
// TODO: Should use some sort of special hidden flag to decorate this account as
// an emergency-only account
String id = isEmergency ? EMERGENCY_ACCOUNT_HANDLE_ID : prefix +
- String.valueOf(phone.getIccSerialNumber());
+ String.valueOf(phone.getFullIccSerialNumber());
return makePstnPhoneAccountHandleWithPrefix(id, prefix, isEmergency);
}
@@ -2470,7 +2470,7 @@
private static Phone getPhoneFromIccId(String iccId) {
if (!TextUtils.isEmpty(iccId)) {
for (Phone phone : PhoneFactory.getPhones()) {
- String phoneIccId = phone.getIccSerialNumber();
+ String phoneIccId = phone.getFullIccSerialNumber();
if (iccId.equals(phoneIccId)) {
return phone;
}
diff --git a/src/com/android/phone/settings/PhoneAccountSettingsFragment.java b/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
index 25c0f95..77de3f5 100644
--- a/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
+++ b/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
@@ -306,8 +306,8 @@
retval = isSim1 ? -1 : 1;
}
- int subId1 = PhoneUtils.getSubIdForPhoneAccount(account1);
- int subId2 = PhoneUtils.getSubIdForPhoneAccount(account2);
+ int subId1 = mTelephonyManager.getSubIdForPhoneAccount(account1);
+ int subId2 = mTelephonyManager.getSubIdForPhoneAccount(account2);
if (subId1 != SubscriptionManager.INVALID_SUBSCRIPTION_ID &&
subId2 != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
retval = (mSubscriptionManager.getSlotId(subId1) <
diff --git a/src/com/android/phone/vvm/omtp/OmtpVvmCarrierConfigHelper.java b/src/com/android/phone/vvm/omtp/OmtpVvmCarrierConfigHelper.java
index 61cf6d3..9534a10 100644
--- a/src/com/android/phone/vvm/omtp/OmtpVvmCarrierConfigHelper.java
+++ b/src/com/android/phone/vvm/omtp/OmtpVvmCarrierConfigHelper.java
@@ -94,7 +94,7 @@
return false;
}
return mCarrierConfig
- .getBoolean(CarrierConfigManager.KEY_VVM_CELLULAR_DATA_REQUIRED_BOOLEAN);
+ .getBoolean(CarrierConfigManager.KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL);
}
public boolean isPrefetchEnabled() {
@@ -102,7 +102,7 @@
return false;
}
return mCarrierConfig
- .getBoolean(CarrierConfigManager.KEY_VVM_PREFETCH_BOOLEAN);
+ .getBoolean(CarrierConfigManager.KEY_VVM_PREFETCH_BOOL);
}
public void startActivation() {
diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 91ee5a0..40e4ef9 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -617,7 +617,8 @@
if (phone == null)
continue;
- if (ServiceState.STATE_IN_SERVICE == phone.getServiceState().getState()) {
+ if (ServiceState.STATE_IN_SERVICE == phone.getServiceState().getState() ||
+ phone.getServiceState().isEmergencyOnly()) {
// the slot has the radio on & state is in service. This will be quicker,
// so just shortcut and use this option.
Log.d(this, "getFirstPhoneForEmergencyCall, radio on & in service, slotId:" + i);