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

Commit 5918519f authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi Committed by Android (Google) Code Review
Browse files

Merge "Add null check for MotionEvent#getDevice."

parents 276793a8 9a4450ba

core/java/android/view/ViewRootImpl.java

+4 −1
Original line number Diff line number Diff line
@@ -4191,7 +4191,10 @@ public final class ViewRootImpl implements ViewParent, 


                    if (mPointerIconShape != pointerShape) {

                        mPointerIconShape = pointerShape;

                        event.getDevice().setPointerShape(pointerShape);

                        final InputDevice inputDevice = event.getDevice();

                        if (inputDevice != null) {

                            inputDevice.setPointerShape(pointerShape);

                        }

                    }

                } else if (event.getActionMasked() == MotionEvent.ACTION_HOVER_MOVE) {

                    mPointerIconShape = PointerIcon.STYLE_NOT_SPECIFIED;