Merge "Fix long click crash." into udc-dev

This commit is contained in:
Ahmad Khalil
2023-05-22 18:49:53 +00:00
committed by Android (Google) Code Review

View File

@@ -7734,13 +7734,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_LONG_CLICKED); sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_LONG_CLICKED);
boolean handled = false; boolean handled = false;
final ListenerInfo li = mListenerInfo; final OnLongClickListener listener =
mListenerInfo == null ? null : mListenerInfo.mOnLongClickListener;
boolean shouldPerformHapticFeedback = true; boolean shouldPerformHapticFeedback = true;
if (li != null && li.mOnLongClickListener != null) { if (listener != null) {
handled = li.mOnLongClickListener.onLongClick(View.this); handled = listener.onLongClick(View.this);
if (handled) { if (handled) {
shouldPerformHapticFeedback = shouldPerformHapticFeedback = listener.onLongClickUseDefaultHapticFeedback(
li.mOnLongClickListener.onLongClickUseDefaultHapticFeedback(View.this); View.this);
} }
} }
if (!handled) { if (!handled) {