Bug:
24342670
Change-Id: Icfb7db0c1b5c6688c16248daa5e6c0443ff45392
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);
}