From a34290fb3fb8adcfb783815c6079c5f31cdc3eb1 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 18 Jan 2024 13:03:50 +0100 Subject: [PATCH] Revert "Prevent crash" This reverts commit f327dbabe657ecf7de916000e08d1305d896e2ca. --- .../recyclerview/widget/RecyclerView.java | 4 ---- patches/RecyclerView.patch | 15 --------------- 2 files changed, 19 deletions(-) delete mode 100644 patches/RecyclerView.patch diff --git a/app/src/main/java/androidx/recyclerview/widget/RecyclerView.java b/app/src/main/java/androidx/recyclerview/widget/RecyclerView.java index d02792973f..9265d56d01 100644 --- a/app/src/main/java/androidx/recyclerview/widget/RecyclerView.java +++ b/app/src/main/java/androidx/recyclerview/widget/RecyclerView.java @@ -4659,10 +4659,6 @@ public class RecyclerView extends ViewGroup implements ScrollingView, */ private void dispatchLayoutStep3() { mState.assertLayoutStep(State.STEP_ANIMATIONS); - if ((State.STEP_ANIMATIONS & mState.mLayoutStep) == 0) { - eu.faircode.email.Log.w(new Throwable("RecyclerView.dispatchLayoutStep3")); - return; - } startInterceptRequestLayout(); onEnterLayoutOrScroll(); mState.mLayoutStep = State.STEP_START; diff --git a/patches/RecyclerView.patch b/patches/RecyclerView.patch deleted file mode 100644 index fa54ad634a..0000000000 --- a/patches/RecyclerView.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/app/src/main/java/androidx/recyclerview/widget/RecyclerView.java b/app/src/main/java/androidx/recyclerview/widget/RecyclerView.java -index 9265d56d01..d02792973f 100644 ---- a/app/src/main/java/androidx/recyclerview/widget/RecyclerView.java -+++ b/app/src/main/java/androidx/recyclerview/widget/RecyclerView.java -@@ -4659,6 +4659,10 @@ public class RecyclerView extends ViewGroup implements ScrollingView, - */ - private void dispatchLayoutStep3() { - mState.assertLayoutStep(State.STEP_ANIMATIONS); -+ if ((State.STEP_ANIMATIONS & mState.mLayoutStep) == 0) { -+ eu.faircode.email.Log.w(new Throwable("RecyclerView.dispatchLayoutStep3")); -+ return; -+ } - startInterceptRequestLayout(); - onEnterLayoutOrScroll(); - mState.mLayoutStep = State.STEP_START;