Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "check for null listenerInfo for drag&drop" into sc-v2-dev

Browse Source
This commit is contained in:
Sally Yuen
2021-10-14 20:35:23 +00:00
committed by Android (Google) Code Review
parent 81f5da9ea3 84bcd89352
commit d05867d498
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/view/View.java
View File

@@ -27060,7 +27060,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
switch (event.mAction) { switch (event.mAction) {
case DragEvent.ACTION_DRAG_STARTED: { case DragEvent.ACTION_DRAG_STARTED: {
if (result && li.mOnDragListener != null) { if (result && li != null && li.mOnDragListener != null) {
sendWindowContentChangedAccessibilityEvent( sendWindowContentChangedAccessibilityEvent(
AccessibilityEvent.CONTENT_CHANGE_TYPE_UNDEFINED); AccessibilityEvent.CONTENT_CHANGE_TYPE_UNDEFINED);
} }
@@ -27074,7 +27074,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
refreshDrawableState(); refreshDrawableState();
} break; } break;
case DragEvent.ACTION_DROP: { case DragEvent.ACTION_DROP: {
if (result && (li.mOnDragListener != null | li.mOnReceiveContentListener != null)) { if (result && li != null && (li.mOnDragListener != null
|| li.mOnReceiveContentListener != null)) {
sendWindowContentChangedAccessibilityEvent( sendWindowContentChangedAccessibilityEvent(
AccessibilityEvent.CONTENT_CHANGE_TYPE_DRAG_DROPPED); AccessibilityEvent.CONTENT_CHANGE_TYPE_DRAG_DROPPED);
} }