From 0410f846bb351fee1b322809154858472f05df52 Mon Sep 17 00:00:00 2001
From: Adnan Begovic <adnan@cyngn.com>
Date: Mon, 21 Mar 2016 11:17:54 -0700
Subject: [PATCH] SetupWizard: Fix regression on GMS account setup skip.

  If a user skips through google setup, make sure we're handling
  the result correctly.

Change-Id: Ie2385dbd45c187dc1a90eab4a519094eae2caa72
TICKET: CYNGNOS-2258
---
 src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java b/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java
index 877f9ac..9bcce42 100644
--- a/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java
@@ -124,9 +124,11 @@ public class GmsAccountPage extends SetupPage {
             } else {
                 handleResult(requestCode, resultCode);
             }
-        } else if (requestCode == SetupWizardApp.REQUEST_CODE_RESTORE_GMS) {
+        } else {
+            if (requestCode == SetupWizardApp.REQUEST_CODE_RESTORE_GMS) {
+                setHidden(true);
+            }
             handleResult(requestCode, resultCode);
-            setHidden(true);
         }
         return true;
     }