summaryrefslogtreecommitdiffstats
path: root/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java
diff options
context:
space:
mode:
authorRoman Birg <roman@cyngn.com>2015-08-07 12:13:32 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-08-07 15:57:58 -0700
commitd587f56e2e04a11271407a127f92d205a018e078 (patch)
tree8125c9261d321d8ad3df13775b14cca2be1f3021 /src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java
parent48115dde4cd1e9f6bfadf08be68eba8d513954db (diff)
downloadpackages_apps_SetupWizard-d587f56e2e04a11271407a127f92d205a018e078.zip
packages_apps_SetupWizard-d587f56e2e04a11271407a127f92d205a018e078.tar.gz
packages_apps_SetupWizard-d587f56e2e04a11271407a127f92d205a018e078.tar.bz2
SetupWizard: don't allow skipping FRP
Change-Id: I7532c0c68418458b921a98e556ee3172b2cf1af3 Signed-off-by: Roman Birg <roman@cyngn.com>
Diffstat (limited to 'src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java')
-rw-r--r--src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java
index 1acfa3b..2fc5729 100644
--- a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java
+++ b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java
@@ -64,7 +64,7 @@ public class CMSetupWizardData extends AbstractSetupData {
.setHidden(!isSimInserted() || mMobileDataEnabled));
}
if (SetupWizardUtils.hasGMS(mContext)) {
- pages.add(new GmsAccountPage(mContext, this).setHidden(true));
+ pages.add(new GmsAccountPage(mContext, this));
}
if (!SetupWizardUtils.hasLeanback(mContext)) {
pages.add(new CyanogenServicesPage(mContext, this).setHidden(true));
@@ -109,11 +109,7 @@ public class CMSetupWizardData extends AbstractSetupData {
private void showHideAccountPages() {
boolean isConnected = SetupWizardUtils.isNetworkConnected(mContext);
- GmsAccountPage gmsAccountPage =
- (GmsAccountPage) getPage(GmsAccountPage.TAG);
- if (gmsAccountPage != null) {
- gmsAccountPage.setHidden(!isConnected);
- }
+
CyanogenServicesPage cyanogenServicesPage =
(CyanogenServicesPage) getPage(CyanogenServicesPage.TAG);
if (cyanogenServicesPage != null) {