commit 07413dea241ade59646c51eba1d846b2e5c1e5d5
author Vadim Tryshev <vadimt@google.com> Thu Apr 18 08:32:06 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Apr 18 08:32:06 2019 -0700
tree c7770a4454b5f4338ddf0a8722becc28ff9b090f
parent d724acc25face1b3f58898a832c31dba2a64eec6
parent 44a063a16fd60a4fdbdb1a93cefcfffbe7428051

Merge "Patching null dereference in AbstractFloatingView.getOpenView()" into ub-launcher3-qt-dev
am: 44a063a16f

Change-Id: Ic6c2e8c7ab79724e1c08ac6f75aef6c0092de2cf

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