commit 7f4ae65fce093c76710fb4ca87c8b7f133daf773
author Hall Liu <hallliu@google.com> Thu Dec 05 01:19:26 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 05 01:19:26 2019 +0000
tree 808ef443115f35270dac6fa0edab2aaea631b83b
parent ddc3ee1f3e7f522f777bc37c7c071f1c94dc31fc
parent 81eb08c560fc3f2977110b9d3188f865251e665c

Merge "Standardize RTT behavior across carriers"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 4a13f7b..552c490 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -5699,12 +5699,7 @@
     public boolean isRttEnabled(int subscriptionId) {
         final long identity = Binder.clearCallingIdentity();
         try {
-            boolean isRttSupported = isRttSupported(subscriptionId);
-            boolean isUserRttSettingOn = Settings.Secure.getInt(
-                    mApp.getContentResolver(), Settings.Secure.RTT_CALLING_MODE, 0) != 0;
-            boolean shouldIgnoreUserRttSetting = mApp.getCarrierConfigForSubId(subscriptionId)
-                    .getBoolean(CarrierConfigManager.KEY_IGNORE_RTT_MODE_SETTING_BOOL);
-            return isRttSupported && (isUserRttSettingOn || shouldIgnoreUserRttSetting);
+            return isRttSupported(subscriptionId);
         } finally {
             Binder.restoreCallingIdentity(identity);
         }

src/com/android/phone/settings/AccessibilitySettingsFragment.java

diff --git a/src/com/android/phone/settings/AccessibilitySettingsFragment.java b/src/com/android/phone/settings/AccessibilitySettingsFragment.java
index b665f4b..c9aa630 100644
--- a/src/com/android/phone/settings/AccessibilitySettingsFragment.java
+++ b/src/com/android/phone/settings/AccessibilitySettingsFragment.java
@@ -166,17 +166,6 @@
             int rttMode = mButtonRtt.isChecked() ? 1 : 0;
             Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.RTT_CALLING_MODE,
                     rttMode);
-            // Update RTT config with IMS Manager if the always-on carrier config isn't set to true.
-            CarrierConfigManager configManager = (CarrierConfigManager) mContext.getSystemService(
-                            Context.CARRIER_CONFIG_SERVICE);
-            for (int subId : SubscriptionController.getInstance().getActiveSubIdList(true)) {
-                if (!configManager.getConfigForSubId(subId).getBoolean(
-                        CarrierConfigManager.KEY_IGNORE_RTT_MODE_SETTING_BOOL, false)) {
-                    int phoneId = SubscriptionController.getInstance().getPhoneId(subId);
-                    ImsManager imsManager = ImsManager.getInstance(getContext(), phoneId);
-                    imsManager.setRttEnabled(mButtonRtt.isChecked());
-                }
-            }
             return true;
         }