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

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

Change-Id: I7f8d7d19157528b4b8962bcf0bc9807089236b79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Florian Mayer 2022-04-01 01:04:16 +00:00 committed by Automerger Merge Worker
commit 877cd36104

View file

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