commit 0ed67f547cf59b7aff7a58ab503c15e69c41c97c
author cretin45 <cretin45@gmail.com> Thu Mar 12 13:50:19 2015 -0700
committer cretin45 <cretin45@gmail.com> Thu Mar 12 13:50:19 2015 -0700
tree b642444564a2ccb15a02e5b82d11197bb44d39f7
parent f66c56b62f03e0a090607043f2c28efae0589123

SetupWizard: Only go through OOBE if owner

Change-Id: I3886119d0d6fd69f18ea23d4b6435da75280dbf8

src/com/cyanogenmod/setupwizard/SetupWizardApp.java

diff --git a/src/com/cyanogenmod/setupwizard/SetupWizardApp.java b/src/com/cyanogenmod/setupwizard/SetupWizardApp.java
index 52f1ead..549cb61 100644
--- a/src/com/cyanogenmod/setupwizard/SetupWizardApp.java
+++ b/src/com/cyanogenmod/setupwizard/SetupWizardApp.java
@@ -61,9 +61,10 @@
         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();