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

Commit 78eda3b6 authored by Tim Murray's avatar Tim Murray Committed by Android (Google) Code Review
Browse files

Merge "compaction: fix two small bugs"

parents 3a8257bb 0a796c10

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

+3 −0
Original line number Diff line number Diff line
@@ -170,6 +170,9 @@ public final class AppCompactor { 
            updateCompactionThrottles();

            updateStatsdSampleRate();

        }

        Process.setThreadGroupAndCpuset(mCompactionThread.getThreadId(),

                Process.THREAD_GROUP_SYSTEM);



    }



    /**

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

+3 −2
Original line number Diff line number Diff line
@@ -1709,8 +1709,9 @@ public final class OomAdjuster { 
                        (app.curAdj == ProcessList.PREVIOUS_APP_ADJ ||

                                app.curAdj == ProcessList.HOME_APP_ADJ)) {

                    mAppCompact.compactAppSome(app);

                } else if (app.setAdj < ProcessList.CACHED_APP_MIN_ADJ &&

                        app.curAdj >= ProcessList.CACHED_APP_MIN_ADJ) {

                } else if (app.setAdj < ProcessList.CACHED_APP_MIN_ADJ

                        && app.curAdj >= ProcessList.CACHED_APP_MIN_ADJ

                        && app.curAdj <= ProcessList.CACHED_APP_MAX_ADJ) {

                    mAppCompact.compactAppFull(app);

                }

            }