commit bc100eff8b01defc79b3ce29a8d3327b2b55b30b
author vadimt <vadimt@google.com> Fri Apr 19 18:35:56 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Apr 19 18:35:56 2019 -0700
tree 3298bcc6d4f53a9dfb86b4cd3f4bed08e80eb364
parent 5ca34bacc80ed3c2606056b418d954a17cd097c1
parent 70b110f96f5498bcc3d41c31ab205a2153a972d3

Patching null dereference in AbstractFloatingView.getOpenView() am: 8e01ddd9b5
am: 70b110f96f

Change-Id: Iefbc81f3ec7696406f93c7180d2a6ea0fab18529

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--) {