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

Commit 0af35e71 authored by Jernej Virag's avatar Jernej Virag Committed by Android (Google) Code Review
Browse files

Merge "Don't use trimMemory(BACKGROUND) for lockscreen trimming." into udc-dev

parents fa25a8e1 5c841cbd

packages/SystemUI/src/com/android/systemui/keyguard/ResourceTrimmer.kt

+2 −1
Original line number Diff line number Diff line
@@ -139,7 +139,8 @@ constructor( 
        if (dozeDisabledAndScreenOff || dozeEnabledAndDozeAnimationCompleted) {

            Trace.beginSection("ResourceTrimmer#trimMemory")

            Log.d(LOG_TAG, "SysUI asleep, trimming memory.")

            globalWindowManager.trimMemory(ComponentCallbacks2.TRIM_MEMORY_BACKGROUND)

            globalWindowManager.trimMemory(ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN)

            globalWindowManager.trimCaches(HardwareRenderer.CACHE_TRIM_ALL)

            Trace.endSection()

        }

    }

packages/SystemUI/tests/src/com/android/systemui/keyguard/ResourceTrimmerTest.kt

+6 −3
Original line number Diff line number Diff line
@@ -98,7 +98,8 @@ class ResourceTrimmerTest : SysuiTestCase() { 
            )

            testScope.runCurrent()

            verify(globalWindowManager, times(1))

                .trimMemory(ComponentCallbacks2.TRIM_MEMORY_BACKGROUND)

                .trimMemory(ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN)

            verify(globalWindowManager, times(1)).trimCaches(HardwareRenderer.CACHE_TRIM_ALL)

        }



    @Test
@@ -115,7 +116,8 @@ class ResourceTrimmerTest : SysuiTestCase() { 
            )

            testScope.runCurrent()

            verify(globalWindowManager, times(1))

                .trimMemory(ComponentCallbacks2.TRIM_MEMORY_BACKGROUND)

                .trimMemory(ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN)

            verify(globalWindowManager, times(1)).trimCaches(HardwareRenderer.CACHE_TRIM_ALL)

        }



    @Test
@@ -161,7 +163,8 @@ class ResourceTrimmerTest : SysuiTestCase() { 
            keyguardRepository.setDozeAmount(1f)

            testScope.runCurrent()

            verify(globalWindowManager, times(1))

                .trimMemory(ComponentCallbacks2.TRIM_MEMORY_BACKGROUND)

                .trimMemory(ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN)

            verify(globalWindowManager, times(1)).trimCaches(HardwareRenderer.CACHE_TRIM_ALL)

        }

    }