SetupWizard: Don't run wizard if user_setup_complete is set

Change-Id: I2e97ecb4fa0458b117e0250595306706245c9c67
This commit is contained in:
cretin45 2015-01-26 16:08:19 -08:00
parent 0d39727f84
commit 202f9273e0
2 changed files with 12 additions and 0 deletions

View File

@ -19,6 +19,8 @@
android:versionCode="3"
android:sharedUserId="android.uid.system">
<original-package android:name="com.cyanogenmod.account" />
<uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
<uses-permission android:name="android.permission.STATUS_BAR" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />

View File

@ -81,6 +81,16 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
if (savedInstanceState != null && savedInstanceState.containsKey("data")) {
mSetupData.load(savedInstanceState.getBundle("data"));
}
// Since this is a new component, we need to disable here if the user
// has already been through setup on a previous version.
try {
if (Settings.Secure.getInt(getContentResolver(),
Settings.Secure.USER_SETUP_COMPLETE) == 1) {
finishSetup();
}
} catch (Settings.SettingNotFoundException e) {
// Continue with setup
}
}
@Override