Commit 822928f0 authored by Michael W's avatar Michael W
Browse files

SetupWizard: Fix Non-GMS upgrade

* Instead of resetting the wizard and relying on the call chain to disable
  the SUW properly, call the finishSetupWizard method directly and step out
* Fixes: Upgrade 14.1 -> 15.1 without gapps looping

Change-Id: I1498a86b3c407aa32faa60c542003a1d596ce031
parent e30af770
......@@ -28,6 +28,8 @@ import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import com.android.setupwizardlib.util.WizardManagerHelper;
import org.lineageos.setupwizard.util.SetupWizardUtils;
import org.lineageos.setupwizard.wizardmanager.WizardManager;
......@@ -46,6 +48,9 @@ public class SetupWizardActivity extends BaseSetupWizardActivity {
}
SetupWizardUtils.disableComponentsForGMS(this);
finish();
} else if (WizardManagerHelper.isUserSetupComplete(this)) {
SetupWizardUtils.finishSetupWizard(this);
finish();
} else {
onSetupStart();
SetupWizardUtils.resetComponent(this, WizardManager.class);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment