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

Commit 87ae6d44 authored by Tim Murray's avatar Tim Murray Committed by Automerger Merge Worker
Browse files

Merge "CachedAppOptimizer: update pending freeze inside the process lock" into... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22912042



Change-Id: I82f15c38b93d30040568ed68afd09962cbe07e77
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 99e365e1 a6af4a5d

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);