From 329783553da4bc2be898f9f373e6c4449da10456 Mon Sep 17 00:00:00 2001
From: Tomasz Wasilczyk <twasilczyk@google.com>
Date: Fri, 14 Feb 2025 13:47:54 -0800
Subject: Revert behavior of isVoiceCapable

Bug: 390681978
Bug: 393424911
Test: TH
Flag: EXEMPT bugfix
Change-Id: I63edd43e322b25284aeef9ef73ecd255b615b974
---
 telephony/java/android/telephony/TelephonyManager.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'telephony')

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 504605d0a1a2..41569deeddb5 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -7080,7 +7080,8 @@ public class TelephonyManager {
      */
     @Deprecated
     public boolean isVoiceCapable() {
-        return hasCapability(PackageManager.FEATURE_TELEPHONY_CALLING,
+        if (mContext == null) return true;
+        return mContext.getResources().getBoolean(
                 com.android.internal.R.bool.config_voice_capable);
     }
 
@@ -7104,7 +7105,8 @@ public class TelephonyManager {
      * @see SubscriptionInfo#getServiceCapabilities()
      */
     public boolean isDeviceVoiceCapable() {
-        return isVoiceCapable();
+        return hasCapability(PackageManager.FEATURE_TELEPHONY_CALLING,
+                com.android.internal.R.bool.config_voice_capable);
     }
 
     /**
-- 
cgit v1.2.3-59-g8ed1b