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

Commit e6491c7e 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 

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

Change-Id: I4bbcbc75d5d5d0a4e2fabc8f0bba215a7fe376d8
parents 9167b901 d05867d4

core/java/android/view/View.java

+3 −2
Original line number Diff line number Diff line
@@ -27060,7 +27060,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);















                }









@@ -27074,7 +27074,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);















                }