| commit | 221b2d7d5e64cc3c829f17c9ee49c8c617d8e5f0 | [log] [tgz] |
|---|---|---|
| author | Brian Isganitis <brianji@google.com> | Thu Mar 03 18:13:58 2022 +0000 |
| committer | Brian Isganitis <brianji@google.com> | Thu Mar 03 18:21:46 2022 +0000 |
| tree | aefee0dc04840530e62d3dbd3c339d161f12e26d | |
| parent | 5e74cd7b069f166ceec5e71f419faf46b511b165 [diff] | |
| parent | 087e879b2541e8e65cce1dce236656c4969c5cd0 [diff] |
[conflict] Merge changes from topic "presubmit-am-4c8411152aef49f099eee419e063b01e" into sc-v2-dev-plus-aosp am: 087e879b25 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16943984 Change-Id: I46336888da6b90649c6def8fbc10c8032f4f2821
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java index 05d6fc6..2fa7945 100644 --- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java +++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -508,7 +508,9 @@ @Override protected void closeComplete() { super.closeComplete(); - mActivityContext.getDragController().removeDragListener(this); + if (mActivityContext.getDragController() != null) { + mActivityContext.getDragController().removeDragListener(this); + } PopupContainerWithArrow openPopup = getOpen(mActivityContext); if (openPopup == null || openPopup.mOriginalIcon != mOriginalIcon) { mOriginalIcon.setTextVisibility(mOriginalIcon.shouldTextBeVisible());