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

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

Change-Id: I45f43a8bde1989b9859e1dff03921101382a9c90
This commit is contained in:
Jiashen Wang
2020-09-17 09:54:21 +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)));
}