SetupWizard: don't allow skipping FRP
Change-Id: I7532c0c68418458b921a98e556ee3172b2cf1af3 Signed-off-by: Roman Birg <roman@cyngn.com>
This commit is contained in:
committed by
Gerrit Code Review
parent
48115dde4c
commit
d587f56e2e
@@ -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) {
|
||||
|
Reference in New Issue
Block a user