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

Commit 3a9f1f54 authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Prevent key removal on cache update 

Recent thumbnail cache keys were prematurely
deleted from the TaskKeyCache.

Test: atest SystemUITests:TaskKeyLruCacheTest

fixes: 111077107
Change-Id: I4d38ba1f69b4a4b9898e1951b68181f27f92c116
parent 3bf7017f

packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/TaskKeyLruCache.java

+5 −1
Original line number Diff line number Diff line
@@ -52,8 +52,12 @@ public class TaskKeyLruCache<V> extends TaskKeyCache<V> { 
                if (mEvictionCallback != null) {

                    mEvictionCallback.onEntryEvicted(mKeys.get(taskId));

                }



                // Only remove from mKeys on cache remove, not a cache update.

                if (newV == null) {

                    mKeys.remove(taskId);

                }

            }

        };

    }

packages/SystemUI/tests/src/com/android/systemui/shared/recents/model/TaskKeyLruCacheTest.java

0 → 100644
+106 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.shared.recents.model;





import static junit.framework.TestCase.assertEquals;

import static junit.framework.TestCase.assertNull;



import android.test.suitebuilder.annotation.SmallTest;



import com.android.systemui.SysuiTestCase;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runners.JUnit4;



@SmallTest

@RunWith(JUnit4.class)

public class TaskKeyLruCacheTest extends SysuiTestCase {

    private static int sCacheSize = 3;

    private static int sIdTask1 = 1;

    private static int sIdTask2 = 2;

    private static int sIdTask3 = 3;

    private static int sIdUser1 = 1;



    TaskKeyCache<Integer> mCache = new TaskKeyLruCache<>(sCacheSize, null);

    Task.TaskKey mKey1;

    Task.TaskKey mKey2;

    Task.TaskKey mKey3;



    @Before

    public void setup() {

        mKey1 = new Task.TaskKey(sIdTask1, 0, null, null, sIdUser1, System.currentTimeMillis());

        mKey2 = new Task.TaskKey(sIdTask2, 0, null, null, sIdUser1, System.currentTimeMillis());

        mKey3 = new Task.TaskKey(sIdTask3, 0, null, null, sIdUser1, System.currentTimeMillis());

    }



    @Test

    public void addSingleItem_get_success() {

        mCache.put(mKey1, 1);



        assertEquals(1, (int) mCache.get(mKey1));

    }



    @Test

    public void addSingleItem_getUninsertedItem_returnsNull() {

        mCache.put(mKey1, 1);



        assertNull(mCache.get(mKey2));

    }



    @Test

    public void emptyCache_get_returnsNull() {

        assertNull(mCache.get(mKey1));

    }



    @Test

    public void updateItem_get_returnsSecond() {

        mCache.put(mKey1, 1);

        mCache.put(mKey1, 2);



        assertEquals(2, (int) mCache.get(mKey1));

        assertEquals(1, mCache.mKeys.size());

    }



    @Test

    public void fillCache_put_evictsOldest() {

        mCache.put(mKey1, 1);

        mCache.put(mKey2, 2);

        mCache.put(mKey3, 3);

        Task.TaskKey key4 = new Task.TaskKey(sIdTask3 + 1, 0,

                null, null, sIdUser1, System.currentTimeMillis());

        mCache.put(key4, 4);



        assertNull(mCache.get(mKey1));

        assertEquals(3, mCache.mKeys.size());

        assertEquals(mKey2, mCache.mKeys.valueAt(0));

    }



    @Test

    public void fillCache_remove_success() {

        mCache.put(mKey1, 1);

        mCache.put(mKey2, 2);

        mCache.put(mKey3, 3);



        mCache.remove(mKey2);



        assertNull(mCache.get(mKey2));

        assertEquals(2, mCache.mKeys.size());

    }

}