From 4fa2836aa5ea067b0885a6cae2704a03b7d76e84 Mon Sep 17 00:00:00 2001
From: pengfeix <quic_pengfeix@quicinc.com>
Date: Tue, 18 Jun 2024 07:02:18 +0530
Subject: [PATCH] Fix popping up the the VoLTE screen when it's disabled by the
 carrier.

- If only has the default carrier config just return, to
  avoid popping up the the VoLTE screen when it's disabled
  by the carrier.

Bug: 332647055
Test: manual
Flag: NONE bugfix
Change-Id: I71bc02f5044535d48726a531e36d57df73bc0f5f
---
 .../network/telephony/Enhanced4gBasePreferenceController.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
index d1988c4a3b7..62edbf81294 100644
--- a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
+++ b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
@@ -107,8 +107,8 @@ public class Enhanced4gBasePreferenceController extends TelephonyTogglePreferenc
         }
 
         final PersistableBundle carrierConfig = getCarrierConfigForSubId(subId);
-        if ((carrierConfig == null)
-                || carrierConfig.getBoolean(CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL)) {
+        if (!CarrierConfigManager.isConfigForIdentifiedCarrier(carrierConfig) ||
+                carrierConfig.getBoolean(CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL)) {
             return CONDITIONALLY_UNAVAILABLE;
         }