summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdnan Begovic <adnan@cyngn.com>2016-03-21 11:17:54 -0700
committerAdnan Begovic <adnan@cyngn.com>2016-03-21 11:38:48 -0700
commit0410f846bb351fee1b322809154858472f05df52 (patch)
tree9bf50fcf9fd8fe0b161822d4ead30d9f3875e17d
parentd114a096476f4a3d6ea181bd6523453f20554243 (diff)
downloadpackages_apps_SetupWizard-0410f846bb351fee1b322809154858472f05df52.zip
packages_apps_SetupWizard-0410f846bb351fee1b322809154858472f05df52.tar.gz
packages_apps_SetupWizard-0410f846bb351fee1b322809154858472f05df52.tar.bz2
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
-rw-r--r--src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java6
1 files 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;
}