Merge "[Settings] Preferred network mode appears during in-call" into tm-dev
This commit is contained in:
@@ -80,9 +80,6 @@ public class EnabledNetworkModePreferenceController extends
|
|||||||
@Override
|
@Override
|
||||||
public int getAvailabilityStatus(int subId) {
|
public int getAvailabilityStatus(int subId) {
|
||||||
boolean visible;
|
boolean visible;
|
||||||
if (!isCallStateIdle()) {
|
|
||||||
return AVAILABLE_UNSEARCHABLE;
|
|
||||||
}
|
|
||||||
|
|
||||||
final PersistableBundle carrierConfig = mCarrierConfigCache.getConfigForSubId(subId);
|
final PersistableBundle carrierConfig = mCarrierConfigCache.getConfigForSubId(subId);
|
||||||
if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
|
if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
|
||||||
@@ -97,6 +94,8 @@ public class EnabledNetworkModePreferenceController extends
|
|||||||
visible = false;
|
visible = false;
|
||||||
} else if (carrierConfig.getBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL)) {
|
} else if (carrierConfig.getBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL)) {
|
||||||
visible = false;
|
visible = false;
|
||||||
|
} else if (!isCallStateIdle()) {
|
||||||
|
return AVAILABLE_UNSEARCHABLE;
|
||||||
} else {
|
} else {
|
||||||
visible = true;
|
visible = true;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user