commit bd0369e642a0976e248328cb56944d601ddac7ac
author Hall Liu <hallliu@google.com> Tue Jul 16 18:30:44 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jul 16 18:30:44 2019 -0700
tree b47e0d56f22fcd54bb52053b46440e102196474b
parent 8610e52994d374a4e67801f76ad0b20f6f5a7da2
parent f5a6b274eff34097178d47306c7bf27593975862

Merge "Show RTT option when there's no default voice sub" am: a74d712f1e
am: f5a6b274ef

Change-Id: If421ba5f628b1b4f2660777317e9a839df9365e0

src/com/android/phone/settings/AccessibilitySettingsFragment.java

diff --git a/src/com/android/phone/settings/AccessibilitySettingsFragment.java b/src/com/android/phone/settings/AccessibilitySettingsFragment.java
index d540fba..cff9c0a 100644
--- a/src/com/android/phone/settings/AccessibilitySettingsFragment.java
+++ b/src/com/android/phone/settings/AccessibilitySettingsFragment.java
@@ -33,6 +33,7 @@
 import com.android.ims.ImsManager;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneFactory;
+import com.android.internal.telephony.SubscriptionController;
 import com.android.phone.PhoneGlobals;
 import com.android.phone.R;
 
@@ -109,8 +110,7 @@
             mButtonHac = null;
         }
 
-        if (PhoneGlobals.getInstance().phoneMgr
-                .isRttSupported(SubscriptionManager.getDefaultVoiceSubscriptionId())) {
+        if (shouldShowRttSetting()) {
             // TODO: this is going to be a on/off switch for now. Ask UX about how to integrate
             // this settings with TTY
             boolean rttOn = Settings.Secure.getInt(
@@ -192,6 +192,21 @@
         return false;
     }
 
+    private boolean shouldShowRttSetting() {
+        int subscriptionId = SubscriptionManager.getDefaultVoiceSubscriptionId();
+        if (subscriptionId == SubscriptionManager.INVALID_SUBSCRIPTION_ID
+                || subscriptionId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID) {
+            for (int subId : SubscriptionController.getInstance().getActiveSubIdList(true)) {
+                if (PhoneGlobals.getInstance().phoneMgr.isRttSupported(subId)) {
+                    return true;
+                }
+            }
+            return false;
+        } else {
+            return PhoneGlobals.getInstance().phoneMgr.isRttSupported(subscriptionId);
+        }
+    }
+
     /**
      * Determines if the device supports TTY per carrier config.
      * @return {@code true} if the carrier supports TTY, {@code false} otherwise.