Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7cb8641 authored by Achim Thesmann's avatar Achim Thesmann Committed by Android (Google) Code Review
Browse files

Merge changes Ic9582e02,I1d2dc449 into main 

* changes:
  Always evaluate callerApp for opted-in sender
  Log resultIfPiSenderAllowsBal
parents a83633a9 51b0892d

services/core/java/com/android/server/wm/BackgroundActivityStartController.java

+2 −1
Original line number Diff line number Diff line
@@ -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);
@@ -509,6 +509,7 @@ public class BackgroundActivityStartController { 
                + "; intent: " + intent

                + "; callerApp: " + callerApp

                + "; inVisibleTask: " + (callerApp != null && callerApp.hasActivityInVisibleTask())

                + "; resultIfPiSenderAllowsBal: " + balCodeToString(resultIfPiSenderAllowsBal)

                + "]";

        if (resultIfPiSenderAllowsBal != BAL_BLOCK) {

            // We should have returned before if !logVerdictChangeByPiDefaultChange