diff --git a/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java b/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java index 2ec668c7..21d34c47 100644 --- a/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java +++ b/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java @@ -124,7 +124,9 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga logActivityState("onStart"); } super.onStart(); - exitIfSetupComplete(); + if (!SetupWizardUtils.isManagedProfile(this)) { + exitIfSetupComplete(); + } } @Override diff --git a/src/org/lineageos/setupwizard/SetupWizardActivity.java b/src/org/lineageos/setupwizard/SetupWizardActivity.java index dfb5e19c..d6ee9b72 100644 --- a/src/org/lineageos/setupwizard/SetupWizardActivity.java +++ b/src/org/lineageos/setupwizard/SetupWizardActivity.java @@ -45,7 +45,8 @@ public class SetupWizardActivity extends BaseSetupWizardActivity { if (SetupWizardUtils.hasGMS(this)) { SetupWizardUtils.disableHome(this); finish(); - } else if (WizardManagerHelper.isUserSetupComplete(this)) { + } else if (WizardManagerHelper.isUserSetupComplete(this) + && !SetupWizardUtils.isManagedProfile(this)) { SetupWizardUtils.finishSetupWizard(this); finish(); } else {