Merge "Don't check carrierconfig for displaying RTT setting" into qt-qpr1-dev
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 777c884..54480e4 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -444,7 +444,7 @@
<string name="fdn_failed" msgid="540018079008319747">"Falha de FDN."</string>
<string name="simContacts_emptyLoading" msgid="2203331234764498011">"A ler a partir do cartão SIM..."</string>
<string name="simContacts_empty" msgid="5270660846489561932">"Sem contactos no cartão SIM."</string>
- <string name="simContacts_title" msgid="1861472842524839921">"Seleccione os contactos a importar"</string>
+ <string name="simContacts_title" msgid="1861472842524839921">"Selecione os contactos a importar"</string>
<string name="simContacts_airplaneMode" msgid="5254946758982621072">"Desative o modo de avião para importar contactos do cartão SIM."</string>
<string name="enable_pin" msgid="5422767284133234860">"Ativar/desativar o PIN do cartão SIM"</string>
<string name="change_pin" msgid="9174186126330785343">"Alterar o PIN do cartão SIM"</string>
diff --git a/src/com/android/phone/settings/AccessibilitySettingsFragment.java b/src/com/android/phone/settings/AccessibilitySettingsFragment.java
index 7c487b2..2965685 100644
--- a/src/com/android/phone/settings/AccessibilitySettingsFragment.java
+++ b/src/com/android/phone/settings/AccessibilitySettingsFragment.java
@@ -166,7 +166,8 @@
for (int subId : SubscriptionController.getInstance().getActiveSubIdList(true)) {
if (!configManager.getConfigForSubId(subId).getBoolean(
CarrierConfigManager.KEY_IGNORE_RTT_MODE_SETTING_BOOL, false)) {
- ImsManager imsManager = ImsManager.getInstance(getContext(), subId);
+ int phoneId = SubscriptionController.getInstance().getPhoneId(subId);
+ ImsManager imsManager = ImsManager.getInstance(getContext(), phoneId);
imsManager.setRttEnabled(mButtonRtt.isChecked());
}
}