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

Commit ff2eec89 authored by Federico Baron's avatar Federico Baron Committed by Android (Google) Code Review
Browse files

Merge "Stop interrupt to see if it fixes failing tests" into main

parents 50c0b9a2 e392955e

src/com/android/launcher3/recyclerview/AllAppsRecyclerViewPool.kt

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ class AllAppsRecyclerViewPool<T> : RecycledViewPool() { 
                override fun getLayoutManager(): RecyclerView.LayoutManager? = null

            }



        executorRunnable?.cancel(/* interrupt= */ true)

        executorRunnable?.cancel(/* interrupt= */ false)

        executorRunnable =

            ExecutorRunnable.createAndExecute(

                VIEW_PREINFLATION_EXECUTOR,

tests/src/com/android/launcher3/util/ExecutorRunnableTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ class ExecutorRunnableTest { 


    @Test

    fun run_and_cancel_cancelCallback() {

        underTest.cancel(true)

        underTest.cancel(false)

        awaitAllExecutorCompleted()



        assertFalse(isCallbackExecuted)
@@ -77,7 +77,7 @@ class ExecutorRunnableTest { 
    fun run_and_cancelAfterCompletion_executeAll() {

        awaitAllExecutorCompleted()



        underTest.cancel(true)

        underTest.cancel(false)



        assertTrue(isTaskExecuted)

        assertTrue(isCallbackExecuted)