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

Commit d4d07de4 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Fix overriding pending ProcessChangeItems" into rvc-dev am:... 

Merge "Merge "Fix overriding pending ProcessChangeItems" into rvc-dev am: f45667fd am: 7e0fc86f" into rvc-d1-dev-plus-aosp am: c8280bd5

Change-Id: Idb257629feb761c11b18eb26a9d6338ceeb29f0e
parents 81f0c4d6 c8280bd5

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

+1 −1
Original line number Diff line number Diff line
@@ -17698,7 +17698,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








@@ -2385,7 +2385,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,