SetupWizard: Fix scenario where GMS setup disables its components

Change-Id: Ia8edd39645f83625ff06fb61903b672b774257d6

1 files changed, 4 insertions, 1 deletions

diff --git a/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java b/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java
index 2c4203f..11f9e7c 100644
--- a/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java
@@ -125,6 +125,7 @@ public class GmsAccountPage extends SetupPage {
             }
         } else if (requestCode == SetupWizardApp.REQUEST_CODE_RESTORE_GMS) {
             handleResult(resultCode);
+            setHidden(true);
         }
         return true;
     }
@@ -150,6 +151,8 @@ public class GmsAccountPage extends SetupPage {
 
     private static void launchGmsRestorePage(final Activity activity) {
         try {
+            // GMS can disable this after logging in sometimes
+            SetupWizardUtils.enableGMSSetupWizard(activity);
             Intent intent = new Intent(ACTION_RESTORE);
             intent.putExtra(SetupWizardApp.EXTRA_ALLOW_SKIP, true);
             intent.putExtra(SetupWizardApp.EXTRA_USE_IMMERSIVE, true);
@@ -169,7 +172,7 @@ public class GmsAccountPage extends SetupPage {
             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();
+            ((SetupWizardActivity) activity).onNextPage();
         }
     }