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

Commit 75fddf2c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix negative freezer timeout" into sc-dev am: 7e12f3e9 

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

Change-Id: I07d0f191ccd426bf2846183f7f2cfd060f4b950b
parents f65b3886 7e12f3e9

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

+1 −1
Original line number Diff line number Diff line
@@ -838,7 +838,7 @@ public final class CachedAppOptimizer { 
                KEY_FREEZER_DEBOUNCE_TIMEOUT, DEFAULT_FREEZER_DEBOUNCE_TIMEOUT);



        if (mFreezerDebounceTimeout < 0) {

            mFullDeltaRssThrottleKb = DEFAULT_FREEZER_DEBOUNCE_TIMEOUT;

            mFreezerDebounceTimeout = DEFAULT_FREEZER_DEBOUNCE_TIMEOUT;

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ final class ProcessCachedOptimizerRecord { 
        return mFreezeExempt;

    }



    @GuardedBy("mPreLock")

    @GuardedBy("mProcLock")

    void setFreezeExempt(boolean exempt) {

        mFreezeExempt = exempt;

    }