Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "SimulatdDpad: fix NPE for event without device" into jb-mr1-aah-dev

Browse Source
This commit is contained in:
Dake Gu
2013-02-06 22:56:58 +00:00
committed by Android (Google) Code Review
parent b3a57191e6 9f811fd447
commit 96111ddff7
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/view/SimulatedDpad.java
View File

@@ -145,6 +145,10 @@ class SimulatedDpad {
if (!synthesizeNewKeys) { if (!synthesizeNewKeys) {
mHandler.removeMessages(MSG_FLICK); mHandler.removeMessages(MSG_FLICK);
} }
InputDevice device = event.getDevice();
if (device == null) {
return;
}
// Store what time the touchpad event occurred // Store what time the touchpad event occurred
final long time = SystemClock.uptimeMillis(); final long time = SystemClock.uptimeMillis();
switch (event.getAction()) { switch (event.getAction()) {
@@ -157,7 +161,7 @@ class SimulatedDpad {
mAccumulatedY = 0; mAccumulatedY = 0;
mLastMoveX = 0; mLastMoveX = 0;
mLastMoveY = 0; mLastMoveY = 0;
if (event.getDevice().getMotionRange(MotionEvent.AXIS_Y).getMax() if (device.getMotionRange(MotionEvent.AXIS_Y).getMax()
* EDGE_SWIPE_THRESHOLD < event.getY()) { * EDGE_SWIPE_THRESHOLD < event.getY()) {
// Did the swipe begin in a valid region // Did the swipe begin in a valid region
mEdgeSwipePossible = true; mEdgeSwipePossible = true;
@@ -176,7 +180,7 @@ class SimulatedDpad {
} }
// Checks if the swipe has crossed the midpoint // Checks if the swipe has crossed the midpoint
// and if our swipe gesture is complete // and if our swipe gesture is complete
if (event.getY() < (event.getDevice().getMotionRange(MotionEvent.AXIS_Y).getMax() if (event.getY() < (device.getMotionRange(MotionEvent.AXIS_Y).getMax()
* .5) && mEdgeSwipePossible) { * .5) && mEdgeSwipePossible) {
mEdgeSwipePossible = false; mEdgeSwipePossible = false;