Do not display eSIM activation option if the device is eSIm ignored

For the device listed as eSIM ignored device, we should always hide the
eSIM activation button even in the developer mode.
Bug: 168266928
Test: Manually tested

Change-Id: Ide3043606de202c5903e520aa550302ff0d103d3
This commit is contained in:
Jiashen Wang
2020-09-16 15:33:51 -07:00
parent 19af143fe7
commit f537a702dd

View File

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