aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2011-04-22 17:33:24 +0900
committerTadashi G. Takaoka <takaoka@google.com>2011-04-22 17:33:24 +0900
commitd00d963b9d47c1bba6f65534033a33fe7c30dde5 (patch)
tree69531fe140dba89955e324eb9b832c892cd89ada /java/src
parentc5c57b506e97b334a394d23ed73c9597cb55707a (diff)
downloadlatinime-d00d963b9d47c1bba6f65534033a33fe7c30dde5.tar.gz
latinime-d00d963b9d47c1bba6f65534033a33fe7c30dde5.tar.xz
latinime-d00d963b9d47c1bba6f65534033a33fe7c30dde5.zip
Fix NPE on non-distict multitouch device
Change-Id: I6d8a05bf62e510d0556fa4831b3d510041cca63a
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/keyboard/PointerTracker.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
index 29867c381..a95c5cd39 100644
--- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java
+++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
@@ -459,7 +459,8 @@ public class PointerTracker {
keyboard.updateSpacebarPreviewIcon(diff);
// Display spacebar slide language switcher.
showKeyPreview(keyIndex);
- queue.releaseAllPointersExcept(this, eventTime, true);
+ if (queue != null)
+ queue.releaseAllPointersExcept(this, eventTime, true);
}
}
}
@@ -551,7 +552,8 @@ public class PointerTracker {
public void onLongPressed(PointerTrackerQueue queue) {
mKeyAlreadyProcessed = true;
- queue.remove(this);
+ if (queue != null)
+ queue.remove(this);
}
public void onCancelEvent(int x, int y, long eventTime, PointerTrackerQueue queue) {