SetupWizard: Only go through OOBE if owner (0ed67f54) · Commits · e / os / android_packages_apps_SetupWizard

src/com/cyanogenmod/setupwizard/SetupWizardApp.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -61,9 +61,10 @@ public class SetupWizardApp extends Application {
		try {
		// Since this is a new component, we need to disable here if the user
		// has already been through setup on a previous version.
		if (SetupWizardUtils.isGuestUser(this)
		if (!SetupWizardUtils.isOwner()
		\|\| Settings.Secure.getInt(getContentResolver(),
		Settings.Secure.USER_SETUP_COMPLETE) == 1) {
		SetupWizardUtils.disableGMSSetupWizard(this);
		SetupWizardUtils.disableSetupWizard(this);
		} else {
		disableCaptivePortalDetection();

+5 −8

Original line number	Diff line number	Diff line
		@@ -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 FinishPage(mContext, this));
		return new PageList(pages.toArray(new SetupPage[pages.size()]));
		}