diff --git a/src/com/android/settings/privatespace/SetupSuccessFragment.java b/src/com/android/settings/privatespace/SetupSuccessFragment.java index 90be48ea9a4..6eb3e9f336a 100644 --- a/src/com/android/settings/privatespace/SetupSuccessFragment.java +++ b/src/com/android/settings/privatespace/SetupSuccessFragment.java @@ -17,6 +17,7 @@ package com.android.settings.privatespace; import android.app.Activity; +import android.app.ActivityManager; import android.app.settings.SettingsEnums; import android.content.Intent; import android.content.pm.PackageManager; @@ -39,6 +40,8 @@ import com.google.android.setupcompat.template.FooterBarMixin; import com.google.android.setupcompat.template.FooterButton; import com.google.android.setupdesign.GlifLayout; +import java.util.List; + /** Fragment for the final screen shown on successful completion of private space setup. */ public class SetupSuccessFragment extends InstrumentedFragment { private static final String TAG = "SetupSuccessFragment"; @@ -103,7 +106,7 @@ public class SetupSuccessFragment extends InstrumentedFragment { accessPrivateSpaceToast(); startActivity(allAppsIntent); Log.i(TAG, "Private space setup complete"); - activity.finish(); + deleteAllTaskAndFinish(activity); } }; } @@ -118,4 +121,12 @@ public class SetupSuccessFragment extends InstrumentedFragment { drawable) .show(); } + + private void deleteAllTaskAndFinish(Activity activity) { + ActivityManager activityManager = activity.getSystemService(ActivityManager.class); + List tasks = activityManager.getAppTasks(); + for (var task : tasks) { + task.finishAndRemoveTask(); + } + } }