Merge "Opt in SysUI code to allow BAL" into udc-dev

packages/SystemUI/src/com/android/systemui/controls/ui/DetailDialog.kt

@@ -162,7 +162,11 @@ class DetailDialog(
                     broadcastSender.closeSystemDialogs()
                     // not sent as interactive, lest the higher-importance activity launch
                     // be impacted
-                    pendingIntent.send()
+                    val options = ActivityOptions.makeBasic()
+                            .setPendingIntentBackgroundActivityStartMode(
+                                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED)
+                            .toBundle()
+                    pendingIntent.send(options)
                     false
                 }
                 if (keyguardStateController.isUnlocked()) {

packages/SystemUI/src/com/android/systemui/controls/ui/StatusBehavior.kt

@@ -16,6 +16,7 @@
 
 package com.android.systemui.controls.ui
 
+import android.app.ActivityOptions
 import android.app.AlertDialog
 import android.app.PendingIntent
 import android.content.DialogInterface
@@ -74,7 +75,11 @@ class StatusBehavior : Behavior {
                 R.string.controls_open_app,
                 DialogInterface.OnClickListener { dialog, _ ->
                     try {
-                        cws.control?.getAppIntent()?.send()
+                        val options = ActivityOptions.makeBasic()
+                                .setPendingIntentBackgroundActivityStartMode(
+                                        ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED)
+                                .toBundle()
+                        cws.control?.getAppIntent()?.send(options)
                         context.sendBroadcast(Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS))
                     } catch (e: PendingIntent.CanceledException) {
                         cvh.setErrorStatus()

packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceViewComponent.kt

@@ -15,6 +15,7 @@
  */
 package com.android.systemui.smartspace.dagger
 
+import android.app.ActivityOptions
 import android.app.PendingIntent
 import android.content.Intent
 import android.view.View
@@ -81,7 +82,11 @@ interface SmartspaceViewComponent {
                         showOnLockscreen: Boolean
                 ) {
                     if (showOnLockscreen) {
-                        pi.send()
+                        val options = ActivityOptions.makeBasic()
+                                .setPendingIntentBackgroundActivityStartMode(
+                                        ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED)
+                                .toBundle()
+                        pi.send(options)
                     } else {
                         activityStarter.startPendingIntentDismissingKeyguard(pi)
                     }

packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt

@@ -16,6 +16,7 @@
 
 package com.android.systemui.statusbar.lockscreen
 
+import android.app.ActivityOptions
 import android.app.PendingIntent
 import android.app.smartspace.SmartspaceConfig
 import android.app.smartspace.SmartspaceManager
@@ -358,7 +359,11 @@ constructor(
                     showOnLockscreen: Boolean
             ) {
                 if (showOnLockscreen) {
-                    pi.send()
+                    val options = ActivityOptions.makeBasic()
+                            .setPendingIntentBackgroundActivityStartMode(
+                                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED)
+                            .toBundle()
+                    pi.send(options)
                 } else {
                     activityStarter.postStartActivityDismissingKeyguard(pi)
                 }

packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarterImpl.kt

@@ -572,6 +572,9 @@ constructor(
                                     // TODO b/221255671: restrict this to only be set for
                                     // notifications
                                     options.isEligibleForLegacyPermissionPrompt = true
+                                    options.setPendingIntentBackgroundActivityStartMode(
+                                        ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED
+                                    )
                                     return intent.sendAndReturnResult(
                                         null,
                                         0,

packages/SystemUI/src/com/android/systemui/wallet/ui/WalletView.java

@@ -307,6 +307,8 @@ public class WalletView extends FrameLayout implements WalletCardCarousel.OnCard
 
                             BroadcastOptions options = BroadcastOptions.makeBasic();
                             options.setInteractive(true);
+                            options.setPendingIntentBackgroundActivityStartMode(
+                                    BroadcastOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
                             walletCard.getPendingIntent().send(options.toBundle());
                         } catch (PendingIntent.CanceledException e) {
                             Log.w(TAG, "Error sending pending intent for wallet card.");