From bb1f5f2d3742aeab5c8971ae608ad275c691eb68 Mon Sep 17 00:00:00 2001 From: Grant Menke Date: Thu, 22 Feb 2024 07:53:59 -0800 Subject: Resolve infinite getPhoneCapability loop. This CL prevents an infinite loop that was being caused by PhoneConfigurationManager. Test: manual Bug: 326212561 Change-Id: I53c01227ca586cb00662b071d5b1d7fee3c260e3 --- src/java/com/android/internal/telephony/PhoneConfigurationManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/java/com/android/internal/telephony') diff --git a/src/java/com/android/internal/telephony/PhoneConfigurationManager.java b/src/java/com/android/internal/telephony/PhoneConfigurationManager.java index 49e1e387fd..ef96d892c0 100644 --- a/src/java/com/android/internal/telephony/PhoneConfigurationManager.java +++ b/src/java/com/android/internal/telephony/PhoneConfigurationManager.java @@ -560,7 +560,8 @@ public class PhoneConfigurationManager { } public int getNumberOfModemsWithSimultaneousVoiceConnections() { - return getStaticPhoneCapability().getMaxActiveVoiceSubscriptions(); + return maybeOverrideMaxActiveVoiceSubscriptions(mStaticCapability) + .getMaxActiveVoiceSubscriptions(); } public boolean isVirtualDsdaEnabled() { -- cgit v1.2.3