Do not display eSIM activation option if the device is eSIm ignored am: f537a702dd am: 6538ee53cf

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12620221

Change-Id: Ibe4302c154adf38f4ee76e0279691e5d06304e2e
This commit is contained in:
Jiashen Wang
2020-09-17 02:52:12 +00:00
committed by Automerger Merge Worker

View File

@@ -280,7 +280,8 @@ public class MobileNetworkUtils {
String.format("showEuiccSettings: esimIgnoredDevice: %b, enabledEsimUiByDefault: "
+ "%b, euiccProvisioned: %b, inDeveloperMode: %b.",
esimIgnoredDevice, enabledEsimUiByDefault, euiccProvisioned, inDeveloperMode));
return (inDeveloperMode || euiccProvisioned
return (euiccProvisioned
|| (!esimIgnoredDevice && inDeveloperMode)
|| (!esimIgnoredDevice && enabledEsimUiByDefault
&& isCurrentCountrySupported(context)));
}