ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Make callback outlive LruCache." am: 6948bbf62c

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2052189

Change-Id: I19a913c34f9563f71098ff2e995c223d93b3aeb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Florian Mayer 2022-04-01 00:38:55 +00:00 • committed by Automerger Merge Worker
commit 9e67f9302c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libutils/LruCache_test.cpp
View file

@ -298,8 +298,8 @@ TEST_F(LruCacheTest, ClearReuseOk) {
} }
TEST_F(LruCacheTest, Callback) { TEST_F(LruCacheTest, Callback) {
LruCache<SimpleKey, StringValue> cache(100);
EntryRemovedCallback callback; EntryRemovedCallback callback;
LruCache<SimpleKey, StringValue> cache(100);
cache.setOnEntryRemovedListener(&callback); cache.setOnEntryRemovedListener(&callback);
cache.put(1, "one"); cache.put(1, "one");
@ -313,8 +313,8 @@ TEST_F(LruCacheTest, Callback) {
} }
TEST_F(LruCacheTest, CallbackOnClear) { TEST_F(LruCacheTest, CallbackOnClear) {
LruCache<SimpleKey, StringValue> cache(100);
EntryRemovedCallback callback; EntryRemovedCallback callback;
LruCache<SimpleKey, StringValue> cache(100);
cache.setOnEntryRemovedListener(&callback); cache.setOnEntryRemovedListener(&callback);
cache.put(1, "one"); cache.put(1, "one");
@ -326,8 +326,8 @@ TEST_F(LruCacheTest, CallbackOnClear) {
} }
TEST_F(LruCacheTest, CallbackRemovesKeyWorksOK) { TEST_F(LruCacheTest, CallbackRemovesKeyWorksOK) {
LruCache<KeyWithPointer, StringValue> cache(1);
InvalidateKeyCallback callback; InvalidateKeyCallback callback;
LruCache<KeyWithPointer, StringValue> cache(1);
cache.setOnEntryRemovedListener(&callback); cache.setOnEntryRemovedListener(&callback);
KeyWithPointer key1; KeyWithPointer key1;
key1.ptr = new int(1); key1.ptr = new int(1);