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

Commit 1f358b11 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: I5b535a8dbbbf4f567435d666d07d909a9e79021e
parents c14abae1 dea7aa0d

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

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










@@ -19348,8 +19349,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