Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f1d19f5 authored by cretin45's avatar cretin45 Committed by Gerrit Code Review
Browse files

SetupWizard: Catch case where restore activity not found 

Change-Id: I4acd9c2779fc41f087942e37647f90b47d3f3d9a
parent 7970c9b3

src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java

+20 −12
Original line number Diff line number Diff line
@@ -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,6 +145,7 @@ public class GmsAccountPage extends SetupPage { 
    }



    private static void launchGmsRestorePage(final Activity activity) {

        try {

            Intent intent = new Intent(ACTION_RESTORE);

            intent.putExtra(SetupWizardApp.EXTRA_ALLOW_SKIP, true);

            intent.putExtra(SetupWizardApp.EXTRA_USE_IMMERSIVE, true);
@@ -156,6 +158,12 @@ public class GmsAccountPage extends SetupPage { 
            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) {