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

Commit 3aa1952e authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge \"Fixed whitelistManager assignment.\" into nyc-dev 

am: dea7aa0d

Change-Id: I3ba91e222cf0a04e2a08bbefc7d0aeea20485bcb
parents 5d1d6370 dea7aa0d

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

+1 −2
Original line number Diff line number Diff line
@@ -19253,6 +19253,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
        }















        boolean mayBeTop = false;













        app.whitelistManager = false;





























        for (int is = app.services.size()-1;















                is >= 0 && (adj > ProcessList.FOREGROUND_APP_ADJ










@@ -19293,8 +19294,6 @@ public final class ActivityManagerService extends ActivityManagerNative













                }















            }



























            app.whitelistManager = false;



























            for (int conni = s.connections.size()-1;















                    conni >= 0 && (adj > ProcessList.FOREGROUND_APP_ADJ















                            || schedGroup == ProcessList.SCHED_GROUP_BACKGROUND