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

Commit 3a0a6ee1 authored by Rhed Jao's avatar Rhed Jao
Browse files

Fixed NPE in TouchDelegateInfo. 

TouchDelegate allows nullable bounds of delegated view. We provide
a default bounds to create TouchDelegateInfo if it's null.

Bug: 117951101
Test: atest atest AccessibilityEndToEndTest
Change-Id: I914a44520edf159bba37af0b0eb00ab97c00b177
parent a23e0965

core/java/android/view/TouchDelegate.java

+5 −1
Original line number Diff line number Diff line
@@ -165,7 +165,11 @@ public class TouchDelegate { 
    public TouchDelegateInfo getTouchDelegateInfo() {

        if (mTouchDelegateInfo == null) {

            final ArrayMap<Region, View> targetMap = new ArrayMap<>(1);

            targetMap.put(new Region(mBounds), mDelegateView);

            Rect bounds = mBounds;

            if (bounds == null) {

                bounds = new Rect();

            }

            targetMap.put(new Region(bounds), mDelegateView);

            mTouchDelegateInfo = new TouchDelegateInfo(targetMap);

        }

        return mTouchDelegateInfo;