Merge "Fix popping up the the VoLTE screen when it's disabled by the carrier." into main

This commit is contained in:
SongFerng Wang
2025-02-12 18:51:11 -08:00
committed by Gerrit Code Review

View File

@@ -107,8 +107,8 @@ public class Enhanced4gBasePreferenceController extends TelephonyTogglePreferenc
} }
final PersistableBundle carrierConfig = getCarrierConfigForSubId(subId); final PersistableBundle carrierConfig = getCarrierConfigForSubId(subId);
if ((carrierConfig == null) if (!CarrierConfigManager.isConfigForIdentifiedCarrier(carrierConfig) ||
|| carrierConfig.getBoolean(CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL)) { carrierConfig.getBoolean(CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL)) {
return CONDITIONALLY_UNAVAILABLE; return CONDITIONALLY_UNAVAILABLE;
} }