Always evaluate callerApp for opted-in sender

The callerApp must be taken in consideration when either the creator
opted in and supplied the caller app or the sender opted in to use the
caller app (for PendingIntent use cases).

Test: atest BackgroundActivityLaunchTest
Bug: 297880036
Change-Id: Ic9582e023749513e136661e924d92006dcb47737

1 files changed, 1 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/wm/BackgroundActivityStartController.java b/services/core/java/com/android/server/wm/BackgroundActivityStartController.java
index 5399256ac8b0..e97bda218dcd 100644
--- a/services/core/java/com/android/server/wm/BackgroundActivityStartController.java
+++ b/services/core/java/com/android/server/wm/BackgroundActivityStartController.java
@@ -418,7 +418,7 @@ public class BackgroundActivityStartController {
             callerAppUid = realCallingUid;
         }
         // don't abort if the callerApp or other processes of that uid are allowed in any way
-        if (callerApp != null && useCallingUidState) {
+        if (callerApp != null && (useCallingUidState || callerAppBasedOnPiSender)) {
             // first check the original calling process
             final @BalCode int balAllowedForCaller = callerApp
                     .areBackgroundActivityStartsAllowed(appSwitchState);