commit 63767ec86eae5284b50a95eb8bf60b17529c6eee
author Hall Liu <hallliu@google.com> Wed Dec 11 23:58:20 2019 +0000
committer Hall Liu <hallliu@google.com> Wed Dec 11 17:14:21 2019 -0800
tree 95ffe2a6b59c40b4ac8d9b87dd1aa96d83bafabe
parent bfe145da2d77af29f2f7ea7588ddaf218461121c

Revert submission

Reason for revert: Behavior incompatible with Pixels 3 and 3a on VZW

Change-Id: Icbd3edf4dc3e7d934776973d724e8a6da410462a

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 552c490..4a13f7b 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -5699,7 +5699,12 @@
     public boolean isRttEnabled(int subscriptionId) {
         final long identity = Binder.clearCallingIdentity();
         try {
-            return isRttSupported(subscriptionId);
+            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);
         } finally {
             Binder.restoreCallingIdentity(identity);
         }