commit 748cdd006a9254b081c1db473f53ea3ff4a0f9a3
author android-build-team Robot <android-build-team-robot@google.com> Sat Apr 20 23:12:31 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Apr 20 23:12:31 2019 +0000
tree 3298bcc6d4f53a9dfb86b4cd3f4bed08e80eb364
parent 8c614040422926a0b7cd9ec10a1958841c01664d
parent 8e01ddd9b53e3d5f780de5b02f58bf943789ad4b

Snap for 5490587 from 8e01ddd9b53e3d5f780de5b02f58bf943789ad4b to qt-release

Change-Id: Ib2277f2d5aa3b95a0ddbbb004e99a2d528a65f8c

src/com/android/launcher3/AbstractFloatingView.java

diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
index e7d7a69..0e08276 100644
--- a/src/com/android/launcher3/AbstractFloatingView.java
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -182,6 +182,7 @@
     protected static <T extends AbstractFloatingView> T getOpenView(
             ActivityContext activity, @FloatingViewType int type) {
         BaseDragLayer dragLayer = activity.getDragLayer();
+        if (dragLayer == null) return null;
         // Iterate in reverse order. AbstractFloatingView is added later to the dragLayer,
         // and will be one of the last views.
         for (int i = dragLayer.getChildCount() - 1; i >= 0; i--) {