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

Commit d5d9e8d4 authored by Sergey Nikolaienkov's avatar Sergey Nikolaienkov
Browse files

Fix overriding pending ProcessChangeItems 

Append change type to ProcessChangeItem (instead of setting it) after
enqueuing items, so that we do not overried pending changes if the item
was pulled from such set.

Bug: 152929851
Test: manual
Change-Id: I21a576f4be9b23a5b92ca17d720b8ef4e9a353fb
parent b7efa560

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

+1 −1
Original line number Diff line number Diff line
@@ -17664,7 +17664,7 @@ public class ActivityManagerService extends IActivityManager.Stub 














            proc.setReportedForegroundServiceTypes(fgServiceTypes);















            ProcessChangeItem item = enqueueProcessChangeItemLocked(proc.pid, proc.info.uid);













            item.changes = ProcessChangeItem.CHANGE_FOREGROUND_SERVICES;













            item.changes |= ProcessChangeItem.CHANGE_FOREGROUND_SERVICES;















            item.foregroundServiceTypes = fgServiceTypes;





























            if (oomAdj) {

























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



+1
−1




























Original line number
Diff line number
Diff line








@@ -2373,7 +2373,7 @@ public final class OomAdjuster {













                    "Changes in " + app + ": " + changes);















            ActivityManagerService.ProcessChangeItem item =















                    mService.enqueueProcessChangeItemLocked(app.pid, app.info.uid);













            item.changes = changes;













            item.changes |= changes;















            item.foregroundActivities = app.repForegroundActivities;















            item.capability = app.setCapability;















            if (DEBUG_PROCESS_OBSERVERS) Slog.i(TAG_PROCESS_OBSERVERS,