From ea46dea9da0fec86f374db98417ed03e1256e01f Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Wed, 17 Feb 2010 10:04:20 -0800
Subject: [PATCH] Prevent possible NPE in android.gesture.Learner

Change-Id: If9b0ac9a05b6736719d84c6b58be73e3f7771f07
---
 core/java/android/gesture/Learner.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/gesture/Learner.java b/core/java/android/gesture/Learner.java
index 60997e0bb8a73..a105652d45969 100755
--- a/core/java/android/gesture/Learner.java
+++ b/core/java/android/gesture/Learner.java
@@ -72,7 +72,8 @@ abstract class Learner {
         for (int i = 0; i < count; i++) {
             final Instance instance = instances.get(i);
             // the label can be null, as specified in Instance
-            if ((instance.label == null && name == null) || instance.label.equals(name)) {
+            if ((instance.label == null && name == null)
+                    || (instance.label != null && instance.label.equals(name))) {
                 toDelete.add(instance);
             }
         }