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

Commit 8d7711ae authored by Jernej Virag's avatar Jernej Virag Committed by Automerger Merge Worker
Browse files

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

Merge "Don't use trimMemory(BACKGROUND) for lockscreen trimming." into udc-dev am: 0af35e71 am: 920bdf19

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



Change-Id: I739ed4004e724b7a2cfafa72cbf90bbce8b0dbc9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c67f47e3 920bdf19

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)

        }

    }