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

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

Merge "CachedAppOptimizer: update pending freeze inside the process lock" into udc-dev

parents 2cdde680 83f4c75f

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

+5 −3
Original line number Diff line number Diff line
@@ -2100,9 +2100,12 @@ public final class CachedAppOptimizer { 
            final boolean frozen;

            final ProcessCachedOptimizerRecord opt = proc.mOptRecord;



            opt.setPendingFreeze(false);



            synchronized (mProcLock) {

                // someone has canceled this freeze

                if (!opt.isPendingFreeze()) {

                    return;

                }

                opt.setPendingFreeze(false);

                pid = proc.getPid();



                if (mFreezerOverride) {
@@ -2148,7 +2151,6 @@ public final class CachedAppOptimizer { 
                try {

                    traceAppFreeze(proc.processName, pid, -1);

                    Process.setProcessFrozen(pid, proc.uid, true);



                    opt.setFreezeUnfreezeTime(SystemClock.uptimeMillis());

                    opt.setFrozen(true);

                    opt.setHasCollectedFrozenPSS(false);