summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Keisuke Kuroyanagi <ksk@google.com> 2015-10-27 17:29:53 +0900
committer Keisuke Kuroyanagi <ksk@google.com> 2015-10-27 17:29:53 +0900
commit9a4450ba6c5f3fd35817685dd8b08065b08c852e (patch)
tree32bd7b013a54a48496109e067d22e2ac4079b152
parent742bd40328a18849da71a3331d2f328341927a29 (diff)
Add null check for MotionEvent#getDevice.
MotionEvent#getDevice can return null when the device is unknown. Change-Id: I902a96300307e3b2d3b324a2998e470254388e27
-rw-r--r--core/java/android/view/ViewRootImpl.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 7d39a0cc20d9..e17bdd7d9a3e 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -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;