commit 20d3187d88ffc35ccc34c622923c4dc82af959e3
author Jonathan Miranda <jonmiranda@google.com> Tue Jul 21 20:13:06 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 21 20:13:06 2020 +0000
tree d94160a8733e0df87604619fc133d932bebaa18c
parent 30ac97d9386736c3322a3277f74523497627b9f5
parent 447ea429cd9f48a608c11dbef7dec1d2ab22d1ef

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

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;
     }