ADHOC/replicant-packages_apps_SetupWizard
3
0
Fork 0
Code Issues Pull Requests Releases Activity

SetupWizard: Only go through OOBE if owner

Browse Source 
Change-Id: I3886119d0d6fd69f18ea23d4b6435da75280dbf8
This commit is contained in:
cretin45 2015-03-12 13:50:19 -07:00
parent f66c56b62f
commit 0ed67f547c
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/cyanogenmod/setupwizard/SetupWizardApp.java
View File

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

5
src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java
View File

@ -23,7 +23,6 @@ import android.net.ConnectivityManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import com.android.internal.telephony.TelephonyIntents; import com.android.internal.telephony.TelephonyIntents;
import com.cyanogenmod.setupwizard.ui.SetupWizardActivity;
import com.cyanogenmod.setupwizard.util.SetupWizardUtils; import com.cyanogenmod.setupwizard.util.SetupWizardUtils;
import java.util.ArrayList; import java.util.ArrayList;
@ -47,7 +46,7 @@ public class CMSetupWizardData extends AbstractSetupData {
if (SetupWizardUtils.hasTelephony(mContext)) { if (SetupWizardUtils.hasTelephony(mContext)) {
pages.add(new SimCardMissingPage(mContext, this).setHidden(isSimInserted())); 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())); pages.add(new ChooseDataSimPage(mContext, this).setHidden(!allSimsInserted()));
} }
if (SetupWizardUtils.hasTelephony(mContext)) { if (SetupWizardUtils.hasTelephony(mContext)) {
@ -57,12 +56,10 @@ public class CMSetupWizardData extends AbstractSetupData {
if (SetupWizardUtils.hasGMS(mContext)) { if (SetupWizardUtils.hasGMS(mContext)) {
pages.add(new GmsAccountPage(mContext, this).setHidden(true)); pages.add(new GmsAccountPage(mContext, this).setHidden(true));
} }
if (SetupWizardUtils.isOwner()) {
pages.add(new CyanogenServicesPage(mContext, this).setHidden(true)); pages.add(new CyanogenServicesPage(mContext, this).setHidden(true));
pages.add(new CyanogenSettingsPage(mContext, this)); pages.add(new CyanogenSettingsPage(mContext, this));
pages.add(new OtherSettingsPage(mContext, this)); pages.add(new OtherSettingsPage(mContext, this));
pages.add(new DateTimePage(mContext, this)); pages.add(new DateTimePage(mContext, this));
}
pages.add(new FinishPage(mContext, this)); pages.add(new FinishPage(mContext, this));
return new PageList(pages.toArray(new SetupPage[pages.size()])); return new PageList(pages.toArray(new SetupPage[pages.size()]));
} }