commit 417a0500c3d7e14013751dbe62791487b033ee72
author Jason Monk <jmonk@google.com> Mon Oct 19 19:48:15 2015 -0400
committer Jason Monk <jmonk@google.com> Mon Oct 19 20:02:11 2015 -0400
tree 96b248b89d9dbeea67be10eecaf260942c32fd4c
parent 84c62dde3d737e0cc194a24e76dbdac9e8c75170

Hide SIM and IMEI for wifi only devices

Bug: 24342670
Change-Id: Icfb7db0c1b5c6688c16248daa5e6c0443ff45392

src/com/android/settings/deviceinfo/Status.java

diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index b86f9c6..b52a0ad 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -205,8 +205,10 @@
             removePreferenceFromScreen(KEY_SERIAL_NUMBER);
         }
 
-        //Remove SimStatus and Imei for Secondary user as it access Phone b/19165700
-        if (UserHandle.myUserId() != UserHandle.USER_OWNER) {
+        // Remove SimStatus and Imei for Secondary user as it access Phone b/19165700
+        // Also remove on Wi-Fi only devices.
+        if (UserHandle.myUserId() != UserHandle.USER_OWNER
+                || Utils.isWifiOnly(this)) {
             removePreferenceFromScreen(KEY_SIM_STATUS);
             removePreferenceFromScreen(KEY_IMEI_INFO);
         }