From 9b3eb9c9b5f18c124197fa795258da0520a2352f Mon Sep 17 00:00:00 2001
From: Youming Ye <paulye@google.com>
Date: Thu, 9 Aug 2018 16:32:11 -0700
Subject: [PATCH] Fix permission check for TelephonyManager#isTtyModeSupported.

TelephonyManager now calls TelecomManager#isTtySupported directly, instead of calling from its implementation PhoneInterfaceManager.

Bug: 79502396
Test: Manual
Change-Id: I686b93d31850103f1cfb7003fe0506d08a424f27
---
 telephony/java/android/telephony/TelephonyManager.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 37d56eed7434f..4aa2ea60295d5 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -6594,14 +6594,12 @@ public class TelephonyManager {
     @Deprecated
     public boolean isTtyModeSupported() {
         try {
-            ITelephony telephony = getITelephony();
-            if (telephony != null) {
-                return telephony.isTtyModeSupported();
+            TelecomManager telecomManager = TelecomManager.from(mContext);
+            if (telecomManager != null) {
+                return telecomManager.isTtySupported();
             }
-        } catch (RemoteException e) {
-            Log.e(TAG, "Error calling ITelephony#isTtyModeSupported", e);
         } catch (SecurityException e) {
-            Log.e(TAG, "Permission error calling ITelephony#isTtyModeSupported", e);
+            Log.e(TAG, "Permission error calling TelecomManager#isTtySupported", e);
         }
         return false;
     }