Merge "Remove usage of TelecomManager.from() hidden API"

2019-11-21 23:40:35 +00:00
parent d87727f7d9 8aa54aa288
commit 07235288eb
1 changed files with 4 additions and 1 deletions
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -8832,7 +8832,10 @@ public class TelephonyManager {
    @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();
            }