Merge changes from topic "cp-att-rtt-switch"
am: 3041cd6ae1

Change-Id: I2f16dd73c2ea6e801be8fd6b1a17c1564dcf0619
diff --git a/src/com/android/phone/settings/AccessibilitySettingsFragment.java b/src/com/android/phone/settings/AccessibilitySettingsFragment.java
index 334ad6e..5a70fe2 100644
--- a/src/com/android/phone/settings/AccessibilitySettingsFragment.java
+++ b/src/com/android/phone/settings/AccessibilitySettingsFragment.java
@@ -172,7 +172,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());
                 }
             }