Merge "Show VoLTE UI when VoIMS opt-in enabled" into sc-dev

This commit is contained in:
Calvin Pan
2021-03-04 11:33:47 +00:00
committed by Android (Google) Code Review
2 changed files with 21 additions and 1 deletions

View File

@@ -107,12 +107,18 @@ public class Enhanced4gBasePreferenceController extends TelephonyTogglePreferenc
if (!isModeMatched()) {
return CONDITIONALLY_UNAVAILABLE;
}
final VolteQueryImsState queryState = queryImsState(subId);
// Show VoLTE settings if VoIMS opt-in has been enabled irrespective of other VoLTE settings
if (queryState.isVoImsOptInEnabled()) {
return AVAILABLE;
}
final PersistableBundle carrierConfig = getCarrierConfigForSubId(subId);
if ((carrierConfig == null)
|| carrierConfig.getBoolean(CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL)) {
return CONDITIONALLY_UNAVAILABLE;
}
final VolteQueryImsState queryState = queryImsState(subId);
if (!queryState.isReadyToVoLte()) {
return CONDITIONALLY_UNAVAILABLE;
}