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

Commit 345a1793 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Android (Google) Code Review
Browse files

Merge "Recalculate real caller if caller results in block" into main

parents a68495e6 fa8b6125

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

+2 −1
Original line number Diff line number Diff line
@@ -422,8 +422,9 @@ public class BackgroundActivityStartController { 
        }



        BalVerdict resultForCaller = checkBackgroundActivityStartAllowedByCaller(state);

        BalVerdict resultForRealCaller = callingUid == realCallingUid

        BalVerdict resultForRealCaller = callingUid == realCallingUid && resultForCaller.allows()

                ? resultForCaller // no need to calculate again

                // otherwise we might need to recalculate because the logic is not the same

                : checkBackgroundActivityStartAllowedBySender(state, checkedOptions);



        if (resultForCaller.allows()