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

Cleanup exit code

Browse Source 
Change-Id: I5fe6165d87afa63887025c3635eafae9f968c062
This commit is contained in:
Oliver Scott
2024-02-18 01:05:08 -05:00
committed by Michael Bestas
parent fd0fdb8a49
commit feadacc46b
4 changed files with 24 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
View File

@@ -243,19 +243,6 @@ public abstract class BaseSetupWizardActivity extends AppCompatActivity implemen
} }
} }
protected final void finishAllAppTasks() {
List<ActivityManager.AppTask> appTasks =
getSystemService(ActivityManager.class).getAppTasks();
for (ActivityManager.AppTask task : appTasks) {
if (LOGV) {
Log.v(TAG, "Finishing task=" + task.toString());
}
task.finishAndRemoveTask();
}
finish();
}
public void finish() { public void finish() {
if (LOGV) { if (LOGV) {
Log.v(TAG, "finish"); Log.v(TAG, "finish");

5
src/org/lineageos/setupwizard/FinishActivity.java
View File

@@ -183,7 +183,6 @@ public class FinishActivity extends BaseSetupWizardActivity {
} }
private void completeSetup() { private void completeSetup() {
Log.i(TAG, "Setup complete!");
handleEnableMetrics(mSetupWizardApp); handleEnableMetrics(mSetupWizardApp);
handleNavKeys(mSetupWizardApp); handleNavKeys(mSetupWizardApp);
handleRecoveryUpdate(mSetupWizardApp); handleRecoveryUpdate(mSetupWizardApp);
@@ -191,8 +190,10 @@ public class FinishActivity extends BaseSetupWizardActivity {
final WallpaperManager wallpaperManager = final WallpaperManager wallpaperManager =
WallpaperManager.getInstance(mSetupWizardApp); WallpaperManager.getInstance(mSetupWizardApp);
wallpaperManager.forgetLoadedWallpaper(); wallpaperManager.forgetLoadedWallpaper();
finishAllAppTasks(); finishAffinity();
nextAction(RESULT_OK);
SetupWizardUtils.enableStatusBar(); SetupWizardUtils.enableStatusBar();
Log.i(TAG, "Setup complete!");
} }
private static void handleEnableMetrics(SetupWizardApp setupWizardApp) { private static void handleEnableMetrics(SetupWizardApp setupWizardApp) {

42
src/org/lineageos/setupwizard/SetupWizardActivity.java
View File

@@ -26,13 +26,10 @@ import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.provider.Settings;
import android.util.Log; import android.util.Log;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import com.google.android.setupcompat.util.WizardManagerHelper;
import org.lineageos.setupwizard.util.SetupWizardUtils; import org.lineageos.setupwizard.util.SetupWizardUtils;
import org.lineageos.setupwizard.wizardmanager.WizardManager; import org.lineageos.setupwizard.wizardmanager.WizardManager;
@@ -45,33 +42,20 @@ public class SetupWizardActivity extends AppCompatActivity {
if (LOGV) { if (LOGV) {
Log.v(TAG, "onCreate savedInstanceState=" + savedInstanceState); Log.v(TAG, "onCreate savedInstanceState=" + savedInstanceState);
} }
if (SetupWizardUtils.hasGMS(this)) { SetupWizardUtils.enableComponent(this, WizardManager.class);
SetupWizardUtils.disableHome(this); Intent intent = new Intent(ACTION_LOAD);
if (SetupWizardUtils.isOwner()) { if (SetupWizardUtils.isOwner()) {
Settings.Global.putInt(getContentResolver(), intent.putExtra(EXTRA_SCRIPT_URI, getString(R.string.lineage_wizard_script_uri));
Settings.Global.ASSISTED_GPS_ENABLED, 1); } else if (SetupWizardUtils.isManagedProfile(this)) {
} intent.putExtra(EXTRA_SCRIPT_URI, getString(
finish(); R.string.lineage_wizard_script_managed_profile_uri));
} else if (WizardManagerHelper.isUserSetupComplete(this)
&& !SetupWizardUtils.isManagedProfile(this)) {
SetupWizardUtils.startSetupWizardExitProcedure(this);
finish();
} else { } else {
SetupWizardUtils.enableComponent(this, WizardManager.class); intent.putExtra(EXTRA_SCRIPT_URI,
Intent intent = new Intent(ACTION_LOAD); getString(R.string.lineage_wizard_script_user_uri));
if (SetupWizardUtils.isOwner()) {
intent.putExtra(EXTRA_SCRIPT_URI, getString(R.string.lineage_wizard_script_uri));
} else if (SetupWizardUtils.isManagedProfile(this)) {
intent.putExtra(EXTRA_SCRIPT_URI, getString(
R.string.lineage_wizard_script_managed_profile_uri));
} else {
intent.putExtra(EXTRA_SCRIPT_URI,
getString(R.string.lineage_wizard_script_user_uri));
}
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | FLAG_GRANT_READ_URI_PERMISSION);
intent.setPackage(getPackageName());
startActivity(intent);
finish();
} }
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | FLAG_GRANT_READ_URI_PERMISSION);
intent.setPackage(getPackageName());
startActivity(intent);
finish();
} }
} }

8
src/org/lineageos/setupwizard/SetupWizardApp.java
View File

@@ -22,6 +22,7 @@ import android.app.StatusBarManager;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.provider.Settings;
import android.util.Log; import android.util.Log;
import org.lineageos.setupwizard.util.SetupWizardUtils; import org.lineageos.setupwizard.util.SetupWizardUtils;
@@ -85,6 +86,13 @@ public class SetupWizardApp extends Application {
} }
sStatusBarManager = SetupWizardUtils.disableStatusBar(this); sStatusBarManager = SetupWizardUtils.disableStatusBar(this);
mHandler.postDelayed(mRadioTimeoutRunnable, SetupWizardApp.RADIO_READY_TIMEOUT); mHandler.postDelayed(mRadioTimeoutRunnable, SetupWizardApp.RADIO_READY_TIMEOUT);
if (SetupWizardUtils.hasGMS(this)) {
SetupWizardUtils.disableHome(this);
if (SetupWizardUtils.isOwner()) {
Settings.Global.putInt(getContentResolver(),
Settings.Global.ASSISTED_GPS_ENABLED, 1);
}
}
} }
public static StatusBarManager getStatusBarManager() { public static StatusBarManager getStatusBarManager() {