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

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

Merge \\\"Fixed whitelistManager assignment.\\\" into nyc-dev am: dea7aa0d am: 3aa1952e 

am: df404d37

Change-Id: I4ced4f9d02e406ae9f2d7b69b7f9ecb986d77680
parents b155ef7b df404d37

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

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










@@ -19351,8 +19352,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