Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I7c8c4950b0ae19f56d54b606860666cbae506c52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jernej Virag
2023-05-23 14:45:20 +00:00
committed by Automerger Merge Worker
parent 262c068657 0af35e71de
commit 920bdf19bb
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/keyguard/ResourceTrimmer.kt
View File

@@ -139,7 +139,8 @@ constructor(
if (dozeDisabledAndScreenOff || dozeEnabledAndDozeAnimationCompleted) { if (dozeDisabledAndScreenOff || dozeEnabledAndDozeAnimationCompleted) {
Trace.beginSection("ResourceTrimmer#trimMemory") Trace.beginSection("ResourceTrimmer#trimMemory")
Log.d(LOG_TAG, "SysUI asleep, trimming memory.") 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() Trace.endSection()
} }
} }

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

@@ -98,7 +98,8 @@ class ResourceTrimmerTest : SysuiTestCase() {
) )
testScope.runCurrent() testScope.runCurrent()
verify(globalWindowManager, times(1)) 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 @Test
@@ -115,7 +116,8 @@ class ResourceTrimmerTest : SysuiTestCase() {
) )
testScope.runCurrent() testScope.runCurrent()
verify(globalWindowManager, times(1)) 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 @Test
@@ -161,7 +163,8 @@ class ResourceTrimmerTest : SysuiTestCase() {
keyguardRepository.setDozeAmount(1f) keyguardRepository.setDozeAmount(1f)
testScope.runCurrent() testScope.runCurrent()
verify(globalWindowManager, times(1)) verify(globalWindowManager, times(1))
.trimMemory(ComponentCallbacks2.TRIM_MEMORY_BACKGROUND) .trimMemory(ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN)
verify(globalWindowManager, times(1)).trimCaches(HardwareRenderer.CACHE_TRIM_ALL)
} }
} }