diff options
| author | cretin45 <cretin45@gmail.com> | 2015-02-06 13:26:16 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-02-06 22:07:15 +0000 |
| commit | 6f1d19f572c1196eef7f2eff51ccc2a7387e04d2 (patch) | |
| tree | 688bad0aebc043b2614cdebbb753e367c2d8e5cd /src/com | |
| parent | 7970c9b351dc51e5e649294a1854e90e9a7eb181 (diff) | |
| download | packages_apps_SetupWizard-6f1d19f572c1196eef7f2eff51ccc2a7387e04d2.zip packages_apps_SetupWizard-6f1d19f572c1196eef7f2eff51ccc2a7387e04d2.tar.gz packages_apps_SetupWizard-6f1d19f572c1196eef7f2eff51ccc2a7387e04d2.tar.bz2 | |
SetupWizard: Catch case where restore activity not found
Change-Id: I4acd9c2779fc41f087942e37647f90b47d3f3d9a
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java b/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java index 7c899d1..6f4c04b 100644 --- a/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java +++ b/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java @@ -36,6 +36,7 @@ import android.provider.Settings; import com.cyanogenmod.setupwizard.R; import com.cyanogenmod.setupwizard.SetupWizardApp; import com.cyanogenmod.setupwizard.ui.LoadingFragment; +import com.cyanogenmod.setupwizard.ui.SetupWizardActivity; import com.cyanogenmod.setupwizard.util.SetupWizardUtils; import java.io.IOException; @@ -144,18 +145,25 @@ public class GmsAccountPage extends SetupPage { } private static void launchGmsRestorePage(final Activity activity) { - Intent intent = new Intent(ACTION_RESTORE); - intent.putExtra(SetupWizardApp.EXTRA_ALLOW_SKIP, true); - intent.putExtra(SetupWizardApp.EXTRA_USE_IMMERSIVE, true); - intent.putExtra(SetupWizardApp.EXTRA_FIRST_RUN, true); - intent.putExtra(SetupWizardApp.EXTRA_THEME, SetupWizardApp.EXTRA_MATERIAL_LIGHT); - ActivityOptions options = - ActivityOptions.makeCustomAnimation(activity, - android.R.anim.fade_in, - android.R.anim.fade_out); - activity.startActivityForResult( - intent, - SetupWizardApp.REQUEST_CODE_RESTORE_GMS, options.toBundle()); + try { + Intent intent = new Intent(ACTION_RESTORE); + intent.putExtra(SetupWizardApp.EXTRA_ALLOW_SKIP, true); + intent.putExtra(SetupWizardApp.EXTRA_USE_IMMERSIVE, true); + intent.putExtra(SetupWizardApp.EXTRA_FIRST_RUN, true); + intent.putExtra(SetupWizardApp.EXTRA_THEME, SetupWizardApp.EXTRA_MATERIAL_LIGHT); + ActivityOptions options = + ActivityOptions.makeCustomAnimation(activity, + android.R.anim.fade_in, + android.R.anim.fade_out); + activity.startActivityForResult( + intent, + SetupWizardApp.REQUEST_CODE_RESTORE_GMS, options.toBundle()); + } catch (Exception e) { + e.printStackTrace(); + // XXX: In open source, we don't know what gms version a user has. + // Bail if the restore activity is not found. + ((SetupWizardActivity)activity).onNextPage(); + } } private void launchGmsAccountSetup(final Activity activity) { |