commit 1f265cc90783831a19f5369a30c6b598344d47b5
author fbaron <fbaron@google.com> Thu Feb 01 10:29:30 2024 -0800
committer fbaron <fbaron@google.com> Thu Feb 01 13:09:55 2024 -0800
tree f8f365cd3e96a203c277fce65e0d233a5fb31e85
parent ac7c1e373672fa06b200635814d3dd93085a27ae

Fix indexoutofbounds in Folder

Flag: NONE
Test: n/a
Fix: 322875847
Change-Id: I14f6ebe135014c806aee310e5919a72a6e8820f7

src/com/android/launcher3/folder/Folder.java

diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 7ae70e0..2f3f029 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -800,6 +800,14 @@
             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());