Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0845dffb authored by Sally Yuen's avatar Sally Yuen Committed by Automerger Merge Worker
Browse files

Merge "check for null listenerInfo for drag&drop" into sc-v2-dev am: d05867d4 am: e6491c7e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16032676

Change-Id: Icebd889a2befe923addcbd77c127e6365a78d2ca
parents d4c9c2d9 e6491c7e

core/java/android/view/View.java

+3 −2
Original line number Diff line number Diff line
@@ -27078,7 +27078,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 














        switch (event.mAction) {















            case DragEvent.ACTION_DRAG_STARTED: {













                if (result && li.mOnDragListener != null) {













                if (result && li != null && li.mOnDragListener != null) {















                    sendWindowContentChangedAccessibilityEvent(















                            AccessibilityEvent.CONTENT_CHANGE_TYPE_UNDEFINED);















                }









@@ -27092,7 +27092,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













                refreshDrawableState();















            } break;















            case DragEvent.ACTION_DROP: {













                if (result && (li.mOnDragListener != null | li.mOnReceiveContentListener != null)) {













                if (result && li != null && (li.mOnDragListener != null













                        || li.mOnReceiveContentListener != null)) {















                    sendWindowContentChangedAccessibilityEvent(















                            AccessibilityEvent.CONTENT_CHANGE_TYPE_DRAG_DROPPED);















                }