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

Commit 3949afe7 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

Merge "Work around issue #65333586: Took phone out of pocket..." into oc-mr1-dev am: f04b643c 

am: 9b64717b

Change-Id: If72b69832ce407b85a826fb6d00ffd93b17116a1
parents 160d23ec 9b64717b

core/java/com/android/internal/widget/PointerLocationView.java

+7 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.hardware.input.InputManager; 
import android.hardware.input.InputManager.InputDeviceListener;

import android.os.SystemProperties;

import android.util.Log;

import android.util.Slog;

import android.view.InputDevice;

import android.view.KeyEvent;

import android.view.MotionEvent;
@@ -630,6 +631,12 @@ public class PointerLocationView extends View implements InputDeviceListener, 
                    >> MotionEvent.ACTION_POINTER_INDEX_SHIFT; // will be 0 for UP



            final int id = event.getPointerId(index);

            if (id >= NP) {

                Slog.wtf(TAG, "Got pointer ID out of bounds: id=" + id + " arraysize="

                        + NP + " pointerindex=" + index

                        + " action=0x" + Integer.toHexString(action));

                return;

            }

            final PointerState ps = mPointers.get(id);

            ps.mCurDown = false;