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

Commit b54b1a43 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Don't cancel PendingIntents unless the stay_stopped flag is on." into main

parents 72ad48c1 63d69924

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -4418,7 +4418,9 @@ public class ActivityManagerService extends IActivityManager.Stub 
                        packageName, null, userId);

                        packageName, null, userId);

        }

        }

















        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);











        }







        }