From 1f265cc90783831a19f5369a30c6b598344d47b5 Mon Sep 17 00:00:00 2001 From: fbaron Date: Thu, 1 Feb 2024 10:29:30 -0800 Subject: [PATCH] Fix indexoutofbounds in Folder Flag: NONE Test: n/a Fix: 322875847 Change-Id: I14f6ebe135014c806aee310e5919a72a6e8820f7 --- src/com/android/launcher3/folder/Folder.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index 7ae70e097f..2f3f029963 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -800,6 +800,14 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo return; } + int size = getIconsInReadingOrder().size(); + if (size <= 1) { + Log.d(TAG, "Couldn't animate folder closed because there's " + size + " icons"); + closeComplete(false); + post(this::announceAccessibilityChanges); + return; + } + mContent.completePendingPageChanges(); mContent.snapToPageImmediately(mContent.getDestinationPage());