commit 44a063a16fd60a4fdbdb1a93cefcfffbe7428051
author Vadim Tryshev <vadimt@google.com> Thu Apr 18 15:20:11 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 18 15:20:11 2019 +0000
tree ba0a5b34fe280c338247b30823b89304646e286f
parent 2d08ca47f60202df6161928171e65e6c6ccfefd2
parent 5a22ef7e61c13af8810f22d5ff82b72a606b6e78

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

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