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

Commit 92636453 authored by John Reck's avatar John Reck
Browse files

Some devices might skip sending TRIM_BACKGROUND 

So be more defensive in when we do the graphics cleanup
in case we are skipped straight to TRIM_COMPLETE

Test: none
Bug: 314251818
Change-Id: I8b03707b30235db6e2c5972531ff2f4437f02f9d
parent a35c8f83

libs/hwui/renderthread/CacheManager.cpp

+13 −18
Original line number Diff line number Diff line
@@ -124,13 +124,11 @@ void CacheManager::trimMemory(TrimLevel mode) { 
    // flush and submit all work to the gpu and wait for it to finish

    mGrContext->flushAndSubmit(GrSyncCpu::kYes);



    switch (mode) {

        case TrimLevel::BACKGROUND:

    if (mode >= TrimLevel::BACKGROUND) {

        mGrContext->freeGpuResources();

        SkGraphics::PurgeAllCaches();

        mRenderThread.destroyRenderingContext();

            break;

        case TrimLevel::UI_HIDDEN:

    } else if (mode == TrimLevel::UI_HIDDEN) {

        // Here we purge all the unlocked scratch resources and then toggle the resources cache

        // limits between the background and max amounts. This causes the unlocked resources

        // that have persistent data to be purged in LRU order.
@@ -139,9 +137,6 @@ void CacheManager::trimMemory(TrimLevel mode) { 
        mGrContext->purgeUnlockedResources(toSkiaEnum(mMemoryPolicy.purgeScratchOnly));

        mGrContext->setResourceCacheLimit(mMaxResourceBytes);

        SkGraphics::SetFontCacheLimit(mMaxCpuFontCacheBytes);

            break;

        default:

            break;

    }

}