commit 12bfd3082e73228c888a07fd504c43b9d19e9020
author Jayachandran Chinnakkannu <jayachandranc@google.com> Thu Nov 21 16:03:58 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Nov 21 16:03:58 2019 -0800
tree 75992557ac8eda03856ca7e2af735827ccf23669
parent 6ac19321a74b6173ef7e9a57ae11ad6dfdfcc0d9
parent 55e22074085ef2e53b571d109295d4f10c7f4543

Merge "Remove usage of TelecomManager.from() hidden API" am: 07235288eb
am: 55e2207408

Change-Id: Ic49428aa0012cbaae293aea7bbcaafb42459e2f8

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 4f20250..1fc929f 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -8833,7 +8833,10 @@
     @Deprecated
     public boolean isTtyModeSupported() {
         try {
-            TelecomManager telecomManager = TelecomManager.from(mContext);
+            TelecomManager telecomManager = null;
+            if (mContext != null) {
+                telecomManager = mContext.getSystemService(TelecomManager.class);
+            }
             if (telecomManager != null) {
                 return telecomManager.isTtySupported();
             }