From 0ed67f547cf59b7aff7a58ab503c15e69c41c97c Mon Sep 17 00:00:00 2001 From: cretin45 Date: Thu, 12 Mar 2015 13:50:19 -0700 Subject: SetupWizard: Only go through OOBE if owner Change-Id: I3886119d0d6fd69f18ea23d4b6435da75280dbf8 --- .../cyanogenmod/setupwizard/setup/CMSetupWizardData.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/com/cyanogenmod/setupwizard/setup') diff --git a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java index e6ee1de..bb5d846 100644 --- a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java +++ b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java @@ -23,7 +23,6 @@ import android.net.ConnectivityManager; import android.telephony.TelephonyManager; import com.android.internal.telephony.TelephonyIntents; -import com.cyanogenmod.setupwizard.ui.SetupWizardActivity; import com.cyanogenmod.setupwizard.util.SetupWizardUtils; import java.util.ArrayList; @@ -47,7 +46,7 @@ public class CMSetupWizardData extends AbstractSetupData { if (SetupWizardUtils.hasTelephony(mContext)) { pages.add(new SimCardMissingPage(mContext, this).setHidden(isSimInserted())); } - if (SetupWizardUtils.isMultiSimDevice(mContext) && SetupWizardUtils.isOwner()) { + if (SetupWizardUtils.isMultiSimDevice(mContext)) { pages.add(new ChooseDataSimPage(mContext, this).setHidden(!allSimsInserted())); } if (SetupWizardUtils.hasTelephony(mContext)) { @@ -57,12 +56,10 @@ public class CMSetupWizardData extends AbstractSetupData { if (SetupWizardUtils.hasGMS(mContext)) { pages.add(new GmsAccountPage(mContext, this).setHidden(true)); } - if (SetupWizardUtils.isOwner()) { - pages.add(new CyanogenServicesPage(mContext, this).setHidden(true)); - pages.add(new CyanogenSettingsPage(mContext, this)); - pages.add(new OtherSettingsPage(mContext, this)); - pages.add(new DateTimePage(mContext, this)); - } + pages.add(new CyanogenServicesPage(mContext, this).setHidden(true)); + pages.add(new CyanogenSettingsPage(mContext, this)); + pages.add(new OtherSettingsPage(mContext, this)); + pages.add(new DateTimePage(mContext, this)); pages.add(new FinishPage(mContext, this)); return new PageList(pages.toArray(new SetupPage[pages.size()])); } -- cgit v1.1