commit b2a46775032edae134a5c09992649f523abe9464
author Jonathan Miranda <jonmiranda@google.com> Tue Jul 21 20:47:19 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 21 20:47:19 2020 +0000
tree 711c051e375bfb1b72f7e243a2995ef61e3be8af
parent b9a0a99ade7ade5fcfb65df0506e7bf56578388a
parent cbc1336abb525a835e440344694f03b6243dfb96

Merge "Fix folder crash where view is added when it already has a parent." into ub-launcher3-rvc-qpr-dev am: 20d3187d88 am: cbc1336abb

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12195976

Change-Id: Ie6e1c73e161aede9d0ad07f842385e8926609caa

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 de2b5da..b91d1c3 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -1135,6 +1135,9 @@
      * Rearranges the children based on their rank.
      */
     public void rearrangeChildren() {
+        if (!mContent.areViewsBound()) {
+            return;
+        }
         mContent.arrangeChildren(getIconsInReadingOrder());
         mItemsInvalidated = true;
     }