diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java index 594e3b57fb912207ce2d10bce9fe587eac5de633..9534d29cb5e1949ff5c6ffaef4bcee50d4054fb2 100644 --- a/src/org/lineageos/setupwizard/SetupWizardApp.java +++ b/src/org/lineageos/setupwizard/SetupWizardApp.java @@ -106,7 +106,7 @@ public class SetupWizardApp extends Application { sStatusBarManager = SetupWizardUtils.disableStatusBar(this); mHandler.postDelayed(mRadioTimeoutRunnable, SetupWizardApp.RADIO_READY_TIMEOUT); // If the bootloader is locked, and OEM unlocking is allowed, turn it off - if (SetupWizardUtils.isOwner() + if (!Build.IS_EMULATOR && SetupWizardUtils.isOwner() && !SetupWizardUtils.isBootloaderUnlocked(this) && SetupWizardUtils.isOemunlockAllowed(this)) { String manufacturer = Build.MANUFACTURER.toLowerCase();