commit f666891cdb05d0cfd5920b5069fecf7d9c48412c
author Hall Liu <hallliu@google.com> Wed Oct 31 17:05:23 2018 -0700
committer Hall Liu <hallliu@google.com> Wed Oct 31 17:37:08 2018 -0700
tree 6364db04de05cda26d8e1c0cb74011893ed0a88e
parent eab5a7327955cffd44816f15056bf47b536ee502

Change isRttSupported to use a subscription ID

Hook up isRttSupported to a TestApi and also change its signature to
take a sub id for multisim compatibility.

Bug: 113069001
Test: manual (on internal)
Change-Id: Iec6df11668448e4538f1672c7b1e00fad957444e

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 4e47bda..70cba7f 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -4370,7 +4370,14 @@
         }
     }
 
-    public boolean isRttSupported() {
+    /**
+     * Determines whether the device currently supports RTT (Real-time text). Based both on carrier
+     * support for the feature and device firmware support.
+     *
+     * @return {@code true} if the device and carrier both support RTT, {@code false} otherwise.
+     */
+    @Override
+    public boolean isRttSupported(int subscriptionId) {
         final long identity = Binder.clearCallingIdentity();
         try {
             boolean isCarrierSupported = mApp.getCarrierConfigForSubId(
@@ -4384,10 +4391,14 @@
         }
     }
 
-    public boolean isRttEnabled() {
+    /**
+     * Determines whether the user has turned on RTT. Only returns true if the device and carrier
+     * both also support RTT.
+     */
+    public boolean isRttEnabled(int subscriptionId) {
         final long identity = Binder.clearCallingIdentity();
         try {
-            return isRttSupported() && Settings.Secure.getInt(
+            return isRttSupported(subscriptionId) && Settings.Secure.getInt(
                     mPhone.getContext().getContentResolver(),
                     Settings.Secure.RTT_CALLING_MODE, 0) != 0;
         } finally {