am c9f20380: Fix potential NPE

* commit 'c9f203805ca23276fcdcdc79b9298bc1d413ad98': Fix potential NPE
2011-12-01 01:02:31 -08:00 · 2011-12-01 01:02:31 -08:00 · 4096dd23cf
parent 543ca37e59 c9f203805c
commit 4096dd23cf
1 changed files with 2 additions and 1 deletions
--- 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;