diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-12-01 01:02:31 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-12-01 01:02:31 -0800 |
| commit | 4096dd23cfd5860046313610e430ede415d12ffa (patch) | |
| tree | 268d7cd1edecf0d74c742aab48f25d3878fcaaa5 /java/src | |
| parent | 543ca37e59329ce664486618f911608162441545 (diff) | |
| parent | c9f203805ca23276fcdcdc79b9298bc1d413ad98 (diff) | |
| download | latinime-4096dd23cfd5860046313610e430ede415d12ffa.tar.gz latinime-4096dd23cfd5860046313610e430ede415d12ffa.tar.xz latinime-4096dd23cfd5860046313610e430ede415d12ffa.zip | |
am c9f20380: Fix potential NPE
* commit 'c9f203805ca23276fcdcdc79b9298bc1d413ad98':
Fix potential NPE
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/PointerTracker.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java index 4e8765dcc..d69c8c8a3 100644 --- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java +++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java @@ -480,7 +480,8 @@ public class PointerTracker { Key key = onDownKey(x, y, eventTime); // Sliding key is allowed when 1) enabled by configuration, 2) this pointer starts sliding // from modifier key, or 3) this pointer's KeyDetector always allows sliding input. - mIsAllowedSlidingKeyInput = sConfigSlidingKeyInputEnabled || key.isModifier() + mIsAllowedSlidingKeyInput = sConfigSlidingKeyInputEnabled + || (key != null && key.isModifier()) || mKeyDetector.alwaysAllowsSlidingInput(); mKeyboardLayoutHasBeenChanged = false; mKeyAlreadyProcessed = false; |