PawletOS/lineageos_setupwizard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SetupWizard: Fix scenario where GMS setup disables its components

Browse Source 
Change-Id: Ia8edd39645f83625ff06fb61903b672b774257d6
This commit is contained in:
cretin45
2015-02-17 17:09:32 -08:00
parent 77c129f8b9
commit 79840ecb4e
4 changed files with 131 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
View File

@@ -18,7 +18,6 @@ package com.cyanogenmod.setupwizard.ui;
import android.animation.Animator;
import android.app.Activity;
import android.app.AppGlobals;
import android.app.WallpaperManager;
import android.content.Intent;
import android.content.res.Resources;
@@ -305,18 +304,23 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
}
private void finishSetup() {
SetupWizardApp setupWizardApp = (SetupWizardApp)getApplication();
if (!mIsGuestUser) {
getApplication().sendBroadcastAsUser(new Intent(SetupWizardApp.ACTION_FINISHED),
setupWizardApp.sendBroadcastAsUser(new Intent(SetupWizardApp.ACTION_FINISHED),
UserHandle.getCallingUserHandle());
}
mSetupData.finishPages();
Settings.Global.putInt(getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 1);
Settings.Secure.putInt(getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE, 1);
((SetupWizardApp)AppGlobals.getInitialApplication()).enableStatusBar();
setupWizardApp.enableStatusBar();
finish();
if (mEnableAccessibilityController != null) {
mEnableAccessibilityController.onDestroy();
}
SetupWizardUtils.disableSetupWizards(this);
SetupWizardUtils.disableGMSSetupWizard(this);
SetupWizardUtils.disableSetupWizard(this);
Intent intent = new Intent(Intent.ACTION_MAIN);
intent.addCategory(Intent.CATEGORY_HOME);
startActivity(intent);
}
}