diff options
| author | Vadim Tryshev <vadimt@google.com> | 2019-04-18 15:20:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-18 15:20:11 +0000 |
| commit | 44a063a16fd60a4fdbdb1a93cefcfffbe7428051 (patch) | |
| tree | ba0a5b34fe280c338247b30823b89304646e286f /src | |
| parent | 2d08ca47f60202df6161928171e65e6c6ccfefd2 (diff) | |
| parent | 5a22ef7e61c13af8810f22d5ff82b72a606b6e78 (diff) | |
| download | android_packages_apps_Trebuchet-44a063a16fd60a4fdbdb1a93cefcfffbe7428051.tar.gz android_packages_apps_Trebuchet-44a063a16fd60a4fdbdb1a93cefcfffbe7428051.tar.bz2 android_packages_apps_Trebuchet-44a063a16fd60a4fdbdb1a93cefcfffbe7428051.zip | |
Merge "Patching null dereference in AbstractFloatingView.getOpenView()" into ub-launcher3-qt-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/AbstractFloatingView.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java index e7d7a69fd..0e082760a 100644 --- a/src/com/android/launcher3/AbstractFloatingView.java +++ b/src/com/android/launcher3/AbstractFloatingView.java @@ -182,6 +182,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch 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--) { |