Merge "[Settings] Preferred network mode appears during in-call" into tm-dev am: 55d722c2b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18121902 Change-Id: I310ec2cf32fa57ed984836c66f3930baf641d1dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -80,9 +80,6 @@ public class EnabledNetworkModePreferenceController extends
|
||||
@Override
|
||||
public int getAvailabilityStatus(int subId) {
|
||||
boolean visible;
|
||||
if (!isCallStateIdle()) {
|
||||
return AVAILABLE_UNSEARCHABLE;
|
||||
}
|
||||
|
||||
final PersistableBundle carrierConfig = mCarrierConfigCache.getConfigForSubId(subId);
|
||||
if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
|
||||
@@ -97,6 +94,8 @@ public class EnabledNetworkModePreferenceController extends
|
||||
visible = false;
|
||||
} else if (carrierConfig.getBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL)) {
|
||||
visible = false;
|
||||
} else if (!isCallStateIdle()) {
|
||||
return AVAILABLE_UNSEARCHABLE;
|
||||
} else {
|
||||
visible = true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user