Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30e0a4a4 authored by Jason Monk's avatar Jason Monk
Browse files

resolve merge conflicts of 8e189344 to master. 

Change-Id: I07300436383f8f67cb1d85e6f06f2b2ca3a27534
parents 57217ae0 8e189344

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

+4 −2
Original line number Diff line number Diff line
@@ -200,8 +200,10 @@ public class Status extends InstrumentedPreferenceActivity { 
        }



        // 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);

        }