PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 8e18934478 to master.

Browse Source 
Change-Id: I07300436383f8f67cb1d85e6f06f2b2ca3a27534
This commit is contained in:
Jason Monk
2015-10-20 14:29:43 -07:00
parent 57217ae00a 8e18934478
commit 30e0a4a48a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/deviceinfo/Status.java
View File

@@ -199,9 +199,11 @@ public class Status extends InstrumentedPreferenceActivity {
removePreferenceFromScreen(KEY_SERIAL_NUMBER);
}
//Remove SimStatus and Imei for Secondary user as it access Phone b/19165700
// Remove SimStatus and Imei for Secondary user as it access Phone b/19165700
// Also remove on Wi-Fi only devices.
//TODO: the bug above will surface in split system user mode.
if (!UserManager.get(this).isAdminUser()) {
if (!UserManager.get(this).isAdminUser()
|| Utils.isWifiOnly(this)) {
removePreferenceFromScreen(KEY_SIM_STATUS);
removePreferenceFromScreen(KEY_IMEI_INFO);
}