commit f537a702dd231a9980b29de6387624b1d6f0647e
author Jiashen Wang <jiashenwang@google.com> Wed Sep 16 15:33:51 2020 -0700
committer Jiashen Wang <jiashenwang@google.com> Wed Sep 16 15:33:51 2020 -0700
tree 2cc001486d7f6b4627671149ff333c32e92b999e
parent 19af143fe741216382ec8f5c630d575999dfb8c0

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

src/com/android/settings/network/telephony/MobileNetworkUtils.java

diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
index 9339d68..99e69c7 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
@@ -280,7 +280,8 @@
                 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)));
     }