| commit | e392955e3716f984cc171101eb0bf43288daf977 | [log] [tgz] |
|---|---|---|
| author | fbaron <fbaron@google.com> | Fri Dec 15 11:30:58 2023 -0800 |
| committer | fbaron <fbaron@google.com> | Fri Dec 15 11:30:58 2023 -0800 |
| tree | 312006ed41b1c49395f5cdc004682d8040b050fa | |
| parent | 3e3ee0b1905b862d955b3b1092bc04b79000368d [diff] |
Stop interrupt to see if it fixes failing tests Bug: 316394228 Test: atest WidgetsListContentEntryTest Flag: NONE Change-Id: Iaabbcb0c00040f78ad4d6355fef9bc91f4b66ed7
diff --git a/src/com/android/launcher3/recyclerview/AllAppsRecyclerViewPool.kt b/src/com/android/launcher3/recyclerview/AllAppsRecyclerViewPool.kt index cbc6f44..71957e1 100644 --- a/src/com/android/launcher3/recyclerview/AllAppsRecyclerViewPool.kt +++ b/src/com/android/launcher3/recyclerview/AllAppsRecyclerViewPool.kt
@@ -62,7 +62,7 @@ override fun getLayoutManager(): RecyclerView.LayoutManager? = null } - executorRunnable?.cancel(/* interrupt= */ true) + executorRunnable?.cancel(/* interrupt= */ false) executorRunnable = ExecutorRunnable.createAndExecute( VIEW_PREINFLATION_EXECUTOR,
diff --git a/tests/src/com/android/launcher3/util/ExecutorRunnableTest.kt b/tests/src/com/android/launcher3/util/ExecutorRunnableTest.kt index b4591ba..4760cd8 100644 --- a/tests/src/com/android/launcher3/util/ExecutorRunnableTest.kt +++ b/tests/src/com/android/launcher3/util/ExecutorRunnableTest.kt
@@ -66,7 +66,7 @@ @Test fun run_and_cancel_cancelCallback() { - underTest.cancel(true) + underTest.cancel(false) awaitAllExecutorCompleted() assertFalse(isCallbackExecuted) @@ -77,7 +77,7 @@ fun run_and_cancelAfterCompletion_executeAll() { awaitAllExecutorCompleted() - underTest.cancel(true) + underTest.cancel(false) assertTrue(isTaskExecuted) assertTrue(isCallbackExecuted)