commit ba25e099ebafd1254036ad0e898442bf75b32ecd
author Dirk Vogt <dirk@fairphone.com> Wed Aug 17 12:22:47 2016 +0200
committer Teemu Hukkanen <tjhukkan@iki.fi> Mon Jul 31 17:07:17 2017 +0200
tree 04a010ef48234aea86fc0d2c7bd1a9130b047118
parent e901e0cc41659dcf8254620d2bb70d7289a9d463

FPII-2132: FP Open OS 16.06 - Users don't work

The setup wizard was not disabled probably when run by additional user.

FPIIM-1447

Change-Id: Ia6c0ee9d2dc4075e389548e668245bab08cd986b
(cherry picked from commit e8439b67a1e4d59ce2539a847db0ad83f3e02e71)

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ace204c..0412771 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -56,13 +56,10 @@
                   android:windowSoftInputMode="stateAlwaysHidden">
 
             <intent-filter android:priority="9">
-
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.DEVICE_INITIALIZATION_WIZARD" />
-
                 <category android:name="android.intent.category.HOME" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 

src/com/fairphone/setupwizard/SetupWizardApp.java

diff --git a/src/com/fairphone/setupwizard/SetupWizardApp.java b/src/com/fairphone/setupwizard/SetupWizardApp.java
index 8368765..eaea742 100644
--- a/src/com/fairphone/setupwizard/SetupWizardApp.java
+++ b/src/com/fairphone/setupwizard/SetupWizardApp.java
@@ -96,9 +96,10 @@
                 Thread t = new Thread(){
                     @Override
                     public void run() {
-                        Settings.Global.putInt(getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 1);
-                        Settings.Secure.putInt(getContentResolver(),
-                                Settings.Secure.USER_SETUP_COMPLETE, 1);
+                      Settings.Global.putInt(getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 1);
+                       Settings.Secure.putInt(getContentResolver(),
+                               Settings.Secure.USER_SETUP_COMPLETE, 1);
+                       SetupWizardUtils.disableSetupWizard(SetupWizardApp.this);
                     }
                 };
                 t.run();