summaryrefslogtreecommitdiffstats
path: root/src/com/cyanogenmod
diff options
context:
space:
mode:
authorcretin45 <cretin45@gmail.com>2015-02-18 12:14:01 -0800
committercretin45 <cretin45@gmail.com>2015-02-18 12:14:01 -0800
commitc330e5072392d92375f2b704f31d31b97f369330 (patch)
treee4aedeff13899653259e50b4c339da7eb6520a28 /src/com/cyanogenmod
parent79840ecb4e4bfd5093746be41498cfcdc9254509 (diff)
downloadpackages_apps_SetupWizard-c330e5072392d92375f2b704f31d31b97f369330.zip
packages_apps_SetupWizard-c330e5072392d92375f2b704f31d31b97f369330.tar.gz
packages_apps_SetupWizard-c330e5072392d92375f2b704f31d31b97f369330.tar.bz2
SetupWizard: Don't crash on upgrade from 11
There is no need to have an original package as there is no data to persist. Change-Id: Ibfa2be22cb20e5c8a93dd2646da0e4f1db2f89ef
Diffstat (limited to 'src/com/cyanogenmod')
-rw-r--r--src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
index bded6ff..44855a8 100644
--- a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
+++ b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
@@ -111,14 +111,14 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
try {
if (Settings.Secure.getInt(getContentResolver(),
Settings.Secure.USER_SETUP_COMPLETE) == 1) {
- finishSetup();
+ finishSetup(false);
}
} catch (Settings.SettingNotFoundException e) {
// Continue with setup
}
mIsGuestUser = SetupWizardUtils.isGuestUser(this);
if (mIsGuestUser) {
- finishSetup();
+ finishSetup(false);
}
registerReceiver(mSetupData, mSetupData.getIntentFilter());
}
@@ -289,7 +289,7 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
mHandler.post(new Runnable() {
@Override
public void run() {
- finishSetup();
+ finishSetup(true);
}
});
}
@@ -303,9 +303,9 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
anim.start();
}
- private void finishSetup() {
+ private void finishSetup(boolean broadcastFinish) {
SetupWizardApp setupWizardApp = (SetupWizardApp)getApplication();
- if (!mIsGuestUser) {
+ if (broadcastFinish && !mIsGuestUser) {
setupWizardApp.sendBroadcastAsUser(new Intent(SetupWizardApp.ACTION_FINISHED),
UserHandle.getCallingUserHandle());
}