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

SetupWizard: Fix Non-GMS upgrade

Browse Source 
* 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
This commit is contained in:
Michael W
2018-06-18 18:19:00 +02:00
parent e30af770bd
commit 822928f090
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/lineageos/setupwizard/SetupWizardActivity.java
View File

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