From f537a702dd231a9980b29de6387624b1d6f0647e Mon Sep 17 00:00:00 2001
From: Jiashen Wang <jiashenwang@google.com>
Date: Wed, 16 Sep 2020 15:33:51 -0700
Subject: [PATCH] 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
---
 .../android/settings/network/telephony/MobileNetworkUtils.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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