commit 944332b414ce31fdf52f4f00be4668f041780bb7
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 03e5ef17cb7aff3da84a03fa65aff0d9cf145ec8
parent b18634cbe3610cc03678786afab08f90329cff0e
parent cbf9474c4276eddf183dac0805c31690329beccf

Merge "Standardize RTT behavior across carriers"

src/com/android/server/telecom/CallsManager.java

diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index e825a0e..ffe1ee7 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -1188,10 +1188,8 @@
             }
         }
 
-        boolean isRttSettingOn = isRttSettingOn(phoneAccountHandle);
-        if (isRttSettingOn ||
-                extras.getBoolean(TelecomManager.EXTRA_START_CALL_WITH_RTT, false)) {
-            Log.i(this, "Incoming call requesting RTT, rtt setting is %b", isRttSettingOn);
+        if (extras.getBoolean(TelecomManager.EXTRA_START_CALL_WITH_RTT, false)) {
+            Log.i(this, "Incoming call requesting RTT");
             call.createRttStreams();
             // Even if the phone account doesn't support RTT yet, the connection manager might
             // change that. Set this to check it later.
@@ -1639,12 +1637,9 @@
 
                     boolean isVoicemail = isVoicemail(callToUse.getHandle(), accountToUse);
 
-                    boolean isRttSettingOn = isRttSettingOn(phoneAccountHandle);
-                    if (!isVoicemail && (isRttSettingOn || (extras != null
-                            && extras.getBoolean(TelecomManager.EXTRA_START_CALL_WITH_RTT,
-                            false)))) {
-                        Log.d(this, "Outgoing call requesting RTT, rtt setting is %b",
-                                isRttSettingOn);
+                    if (!isVoicemail && extras != null
+                            && extras.getBoolean(TelecomManager.EXTRA_START_CALL_WITH_RTT, false)) {
+                        Log.d(this, "Outgoing call requesting RTT");
                         if (callToUse.isEmergencyCall() || (accountToUse != null
                                 && accountToUse.hasCapabilities(PhoneAccount.CAPABILITY_RTT))) {
                             // If the call requested RTT and it's an emergency call, ignore the
@@ -2530,24 +2525,6 @@
         mProximitySensorManager.turnOff(screenOnImmediately);
     }
 
-    private boolean isRttSettingOn(PhoneAccountHandle handle) {
-        boolean isRttModeSettingOn = Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.RTT_CALLING_MODE, 0) != 0;
-        // If the carrier config says that we should ignore the RTT mode setting from the user,
-        // assume that it's off (i.e. only make an RTT call if it's requested through the extra).
-        boolean shouldIgnoreRttModeSetting = getCarrierConfigForPhoneAccount(handle)
-                .getBoolean(CarrierConfigManager.KEY_IGNORE_RTT_MODE_SETTING_BOOL, false);
-        return isRttModeSettingOn && !shouldIgnoreRttModeSetting;
-    }
-
-    private PersistableBundle getCarrierConfigForPhoneAccount(PhoneAccountHandle handle) {
-        int subscriptionId = mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(handle);
-        CarrierConfigManager carrierConfigManager =
-                mContext.getSystemService(CarrierConfigManager.class);
-        PersistableBundle result = carrierConfigManager.getConfigForSubId(subscriptionId);
-        return result == null ? new PersistableBundle() : result;
-    }
-
     void phoneAccountSelected(Call call, PhoneAccountHandle account, boolean setDefault) {
         if (!mCalls.contains(call)) {
             Log.i(this, "Attempted to add account to unknown call %s", call);