diff options
| author |   satok <satok@google.com> | 2011-04-22 17:44:58 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-04-22 17:44:58 +0900 |
| commit | 5b2d4d5b6750e3009536a238b41de06c90c36a94 (patch) | |
| tree | e8163d6c6184f508f60b85f3cd87609e65b322d4 /java/src | |
| parent | 65a3fb01c1bac3f7004060c8bfb1315c0a72033f (diff) | |
| parent | d00d963b9d47c1bba6f65534033a33fe7c30dde5 (diff) | |
| download | latinime-5b2d4d5b6750e3009536a238b41de06c90c36a94.tar.gz latinime-5b2d4d5b6750e3009536a238b41de06c90c36a94.tar.xz latinime-5b2d4d5b6750e3009536a238b41de06c90c36a94.zip | |
Merge remote-tracking branch 'goog/master' into merge
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/PointerTracker.java | 6 |
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) { |