From d00d963b9d47c1bba6f65534033a33fe7c30dde5 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Fri, 22 Apr 2011 17:33:24 +0900
Subject: [PATCH] Fix NPE on non-distict multitouch device

Change-Id: I6d8a05bf62e510d0556fa4831b3d510041cca63a
---
 .../com/android/inputmethod/keyboard/PointerTracker.java    | 6 ++++--
 1 file 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) {