commit ec28b77bbad4ad05db2ce4f075fd45ce4fefc784
author Qingxi Li <qingxi@google.com> Wed Mar 14 13:27:26 2018 -0700
committer Qingxi Li <qingxi@google.com> Mon Mar 26 17:18:05 2018 -0700
tree f1153f67d141c94eedeb4d8183dd49f2375e65c9
parent 8bcf26a18327cda3cff631c27a7ed2c415fa8b9d

[UI Tweak] Unhide Mobile network > Carrier

When the device is not eSIM ignored device and even the device hasn't
downloaded eSIM profile, we still need to show Mobile network > Carrier.
This should only be true when esim.enable_esim_default_ui is false.

Bug: 74771471
Test: bit TeleServiceTests:* & E2E
Change-Id: I14ba859ba70c9f251e743d5f812b541b0511ffbd

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 2a4cced..f7dc2d3 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -41,6 +41,7 @@
 import android.os.IBinder;
 import android.os.Message;
 import android.os.PersistableBundle;
+import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.ListPreference;
@@ -81,6 +82,7 @@
 import com.android.settingslib.RestrictedLockUtils;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
@@ -98,6 +100,15 @@
 
 public class MobileNetworkSettings extends Activity  {
 
+    // CID of the device.
+    private static final String KEY_CID = "ro.boot.cid";
+    // CIDs of devices which should not show anything related to eSIM.
+    private static final String KEY_ESIM_CID_IGNORE = "ro.setupwizard.esim_cid_ignore";
+    // System Property which is used to decide whether the default eSIM UI will be shown,
+    // the default value is false.
+    private static final String KEY_ENABLE_ESIM_UI_BY_DEFAULT =
+            "esim.enable_esim_system_ui_by_default";
+
     private enum TabState {
         NO_TABS, UPDATE, DO_NOTHING
     }
@@ -151,10 +162,20 @@
         if (!euiccManager.isEnabled()) {
             return false;
         }
+
         ContentResolver cr = context.getContentResolver();
-        return Settings.Global.getInt(cr, Settings.Global.EUICC_PROVISIONED, 0) != 0
-                || Settings.Global.getInt(
-                cr, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
+        final boolean esimIgnoredDevice =
+                Arrays.asList(TextUtils.split(SystemProperties.get(KEY_ESIM_CID_IGNORE, ""), ","))
+                        .contains(SystemProperties.get(KEY_CID, null));
+        final boolean enabledEsimUiByDefault =
+                SystemProperties.getBoolean(KEY_ENABLE_ESIM_UI_BY_DEFAULT, true);
+        final boolean euiccProvisioned =
+                Settings.Global.getInt(cr, Settings.Global.EUICC_PROVISIONED, 0) != 0;
+        final boolean inDeveloperMode =
+                Settings.Global.getInt(cr, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
+
+        return (inDeveloperMode || euiccProvisioned
+                || (!esimIgnoredDevice && enabledEsimUiByDefault));
     }
 
     /**