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

Commit f4781550 authored by David Lin's avatar David Lin Committed by Android (Google) Code Review
Browse files

Merge "Don't cancel PendingIntents unless the stay_stopped flag is on." into 24D1-dev

parents 240a91db 147c4d94

services/core/java/com/android/server/am/ActivityManagerService.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -4451,7 +4451,9 @@ public class ActivityManagerService extends IActivityManager.Stub 
            }

            }

        }

        }

















        if (packageName == null || uninstalling || packageStateStopped) {







        final boolean clearPendingIntentsForStoppedApp = (android.content.pm.Flags.stayStopped()














                && packageStateStopped);














        if (packageName == null || uninstalling || clearPendingIntentsForStoppedApp) {











            didSomething |= mPendingIntentController.removePendingIntentsForPackage(







            didSomething |= mPendingIntentController.removePendingIntentsForPackage(











                    packageName, userId, appId, doit);







                    packageName, userId, appId, doit);











        }







        }