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

Commit 694b069b authored by Tim Murray's avatar Tim Murray Committed by Automerger Merge Worker
Browse files

Merge changes I10a6ea49,I4c8b3331 into udc-dev am: 6a786d5a 

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



Change-Id: I6be7d1992a972208ce3470cb9e86cb87a01a1405
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 61e2b8b3 6a786d5a

libs/hwui/renderthread/CacheManager.cpp

+1 −5
Original line number Original line Diff line number Diff line
@@ -117,12 +117,8 @@ void CacheManager::trimMemory(TrimLevel mode) { 
    // flush and submit all work to the gpu and wait for it to finish

    // flush and submit all work to the gpu and wait for it to finish

    mGrContext->flushAndSubmit(/*syncCpu=*/true);

    mGrContext->flushAndSubmit(/*syncCpu=*/true);





    if (!Properties::isHighEndGfx && mode >= TrimLevel::MODERATE) {

        mode = TrimLevel::COMPLETE;

    }



    switch (mode) {

    switch (mode) {

        case TrimLevel::COMPLETE:

        case TrimLevel::BACKGROUND:

            mGrContext->freeGpuResources();

            mGrContext->freeGpuResources();

            SkGraphics::PurgeAllCaches();

            SkGraphics::PurgeAllCaches();

            mRenderThread.destroyRenderingContext();

            mRenderThread.destroyRenderingContext();

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -213,7 +213,7 @@ final class ActivityManagerConstants extends ContentObserver { 
    private static final boolean DEFAULT_USE_TIERED_CACHED_ADJ = false;

    private static final boolean DEFAULT_USE_TIERED_CACHED_ADJ = false;

    private static final long DEFAULT_TIERED_CACHED_ADJ_DECAY_TIME = 60 * 1000;

    private static final long DEFAULT_TIERED_CACHED_ADJ_DECAY_TIME = 60 * 1000;





    private static final boolean DEFAULT_USE_MODERN_TRIM = false;

    private static final boolean DEFAULT_USE_MODERN_TRIM = true;





    /**

    /**

     * Same as {@link TEMPORARY_ALLOW_LIST_TYPE_FOREGROUND_SERVICE_NOT_ALLOWED}

     * Same as {@link TEMPORARY_ALLOW_LIST_TYPE_FOREGROUND_SERVICE_NOT_ALLOWED}