From ce25b6450fb5f7c9d20511304118059afb18d522 Mon Sep 17 00:00:00 2001 From: Hani Kazmi Date: Fri, 12 May 2023 15:33:12 +0000 Subject: [PATCH] Allow BAL for SuspendedAppActivity Required so it can bring the suspended activity back into the foreground. Bug: 270672466 Test: atest DialogTests#testInterceptorActivity_unsuspend Change-Id: Ic0f0f209ec03598228a72e6a0350c58e60c118bb --- .../com/android/internal/app/SuspendedAppActivity.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/core/java/com/android/internal/app/SuspendedAppActivity.java b/core/java/com/android/internal/app/SuspendedAppActivity.java index 02881372c97f9..a5e775a461a9f 100644 --- a/core/java/com/android/internal/app/SuspendedAppActivity.java +++ b/core/java/com/android/internal/app/SuspendedAppActivity.java @@ -24,6 +24,7 @@ import static android.content.res.Resources.ID_NULL; import android.Manifest; import android.annotation.Nullable; +import android.app.ActivityOptions; import android.app.AlertDialog; import android.app.AppGlobals; import android.app.KeyguardManager; @@ -314,8 +315,15 @@ public class SuspendedAppActivity extends AlertActivity sendBroadcastAsUser(reportUnsuspend, UserHandle.of(mUserId)); if (mOnUnsuspend != null) { + Bundle activityOptions = + ActivityOptions.makeBasic() + .setPendingIntentBackgroundActivityStartMode( + ActivityOptions + .MODE_BACKGROUND_ACTIVITY_START_ALLOWED) + .toBundle(); try { - mOnUnsuspend.sendIntent(this, 0, null, null, null); + mOnUnsuspend.sendIntent(this, 0, null, null, null, null, + activityOptions); } catch (IntentSender.SendIntentException e) { Slog.e(TAG, "Error while starting intent " + mOnUnsuspend, e); }