commit 81eb08c560fc3f2977110b9d3188f865251e665c
author Hall Liu <hallliu@google.com> Tue Oct 29 16:50:20 2019 -0700
committer Hall Liu <hallliu@google.com> Tue Nov 26 18:32:53 2019 -0800
tree 9e8463f648c3c635ace0b57c7036117439bde969
parent 5a301bafb19ef6e06cc7222a740b49cf7dd76f70

Standardize RTT behavior across carriers

Remove references to the ignore rtt setting carrier config key, and
treat it as always-on for all carriers. Also turn on RTT in the IMS
stack when there's no SIM card inserted so that emergency calls can use
RTT in that scenario.

Bug: 122250491
Bug: 130010750
Test: manual
Change-Id: I6e39c9cb9f2fc70cf67afb6ffbf369f66d4449e0
Merged-In: I6e39c9cb9f2fc70cf67afb6ffbf369f66d4449e0

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 27c1a0b..326e7c6 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -5694,12 +5694,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);
         }