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

Commit 93b3c57a authored by Michael Wright's avatar Michael Wright Committed by Siarhei Vishniakou
Browse files

Make PointerLocationView more resilient. 

Right now it crashes if we miss an up event since the active pointer
won't get reset. We can't just clear this in onDetachedFromWindow
because of how it gets drawn in system_server, so instead we just check
before using the active pointer.

Bug: 109779280
Test: put settings into split screen, frequently enable / disable
      Pointer Location while tapping in another app window. See that it
      doesn't crash.
Change-Id: If2b1f3157574c962b24115b0ecf0a27feec8e84c
parent eb3c80bf

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

+26 −26
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ public class PointerLocationView extends View implements InputDeviceListener, 
    }



    private void drawLabels(Canvas canvas) {

        if (mActivePointerId < 0) {

        if (mActivePointerId < 0 || mActivePointerId >= mPointers.size()) {

            return;

        }
@@ -614,8 +614,8 @@ public class PointerLocationView extends View implements InputDeviceListener, 
                NP++;

            }



            if (mActivePointerId < 0 ||

                    !mPointers.get(mActivePointerId).mCurDown) {

            if (mActivePointerId < 0 || mActivePointerId >= NP

                    || !mPointers.get(mActivePointerId).mCurDown) {

                mActivePointerId = id;

            }