summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwangqi <wangqi@google.com>2018-04-03 17:02:44 -0700
committerCopybara-Service <copybara-piper@google.com>2018-04-03 17:08:17 -0700
commit01b782754418aa17dbb867591642b49e473e92b1 (patch)
treed71a3bf4606c11bcf0ce9f2dc2266b5533561c0b
parentbfce344bc18b16d2fe6ee90274e3009ad9b26c7a (diff)
Remove reference to RTT system setting.
This should be handled by PhoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_RTT) Test: none PiperOrigin-RevId: 191522319 Change-Id: I28244a725c63fb3b83e97fd9a585473a94da96d9
-rw-r--r--java/com/android/dialer/telecom/TelecomUtil.java6
-rw-r--r--java/com/android/incallui/CallButtonPresenter.java2
2 files changed, 1 insertions, 7 deletions
diff --git a/java/com/android/dialer/telecom/TelecomUtil.java b/java/com/android/dialer/telecom/TelecomUtil.java
index f05ec202d..2608cb2aa 100644
--- a/java/com/android/dialer/telecom/TelecomUtil.java
+++ b/java/com/android/dialer/telecom/TelecomUtil.java
@@ -26,7 +26,6 @@ import android.net.Uri;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import android.provider.CallLog.Calls;
-import android.provider.Settings;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.RequiresPermission;
@@ -300,11 +299,6 @@ public abstract class TelecomUtil {
return instance.isDefaultDialer(context);
}
- public static boolean isRttEnabled(Context context) {
- return Settings.System.getInt(context.getContentResolver(), Settings.System.RTT_CALLING_MODE, 0)
- != 0;
- }
-
/** @return the other SIM based PhoneAccountHandle that is not {@code currentAccount} */
@Nullable
@RequiresPermission(permission.READ_PHONE_STATE)
diff --git a/java/com/android/incallui/CallButtonPresenter.java b/java/com/android/incallui/CallButtonPresenter.java
index 38c8da898..833460398 100644
--- a/java/com/android/incallui/CallButtonPresenter.java
+++ b/java/com/android/incallui/CallButtonPresenter.java
@@ -479,7 +479,7 @@ public class CallButtonPresenter
// Most devices cannot make calls on 2 SIMs at the same time.
&& InCallPresenter.getInstance().getCallList().getAllCalls().size() == 1;
- boolean showUpgradeToRtt = TelecomUtil.isRttEnabled(context) && call.canUpgradeToRttCall();
+ boolean showUpgradeToRtt = call.canUpgradeToRttCall();
inCallButtonUi.showButton(InCallButtonIds.BUTTON_AUDIO, true);
inCallButtonUi.showButton(InCallButtonIds.BUTTON_SWAP, showSwap);