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

Commit 36f8ff7f authored by Winson Chung's avatar Winson Chung
Browse files

Always copy provided gesture exclusion rects 

- Disallow callers from concurrently modifying the exclusion rects
  list after it's set by making a copy.

Bug: 166594759
Test: atest android.view.cts.SystemGestureExclusionRectsTest
Change-Id: I80183cf85d16ac669320cfda9ec9deed9e348e33
parent 5eef4114

core/java/android/view/View.java

+9 −6
Original line number Diff line number Diff line
@@ -4721,9 +4721,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        WindowInsetsAnimation.Callback mWindowInsetsAnimationCallback;















        /**













         * This lives here since it's only valid for interactive views.













         * This lives here since it's only valid for interactive views. This list is null until the













         * first use.















         */













        private List<Rect> mSystemGestureExclusionRects;













        private List<Rect> mSystemGestureExclusionRects = null;





























        /**















         * Used to track {@link #mSystemGestureExclusionRects}










@@ -11581,8 +11582,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     * a precision touch gesture in a small area in either the X or Y dimension, such as















     * an edge swipe or dragging a <code>SeekBar</code> thumb.</p>















     *













     * <p>Do not modify the provided list after this method is called.</p>













     *















     * <p>Note: the system will put a limit of <code>200dp</code> on the vertical extent of the















     * exclusions it takes into account. The limit does not apply while the navigation















     * bar is {@link #SYSTEM_UI_FLAG_IMMERSIVE_STICKY stickily} hidden, nor to the









@@ -11596,13 +11595,17 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













        if (rects.isEmpty() && mListenerInfo == null) return;





























        final ListenerInfo info = getListenerInfo();













        if (info.mSystemGestureExclusionRects != null) {













            info.mSystemGestureExclusionRects.clear();













            info.mSystemGestureExclusionRects.addAll(rects);













        } else {













            info.mSystemGestureExclusionRects = new ArrayList<>(rects);













        }















        if (rects.isEmpty()) {













            info.mSystemGestureExclusionRects = null;















            if (info.mPositionUpdateListener != null) {















                mRenderNode.removePositionUpdateListener(info.mPositionUpdateListener);















            }















        } else {













            info.mSystemGestureExclusionRects = rects;















            if (info.mPositionUpdateListener == null) {















                info.mPositionUpdateListener = new RenderNode.PositionUpdateListener() {















                    @Override