commit ea46dea9da0fec86f374db98417ed03e1256e01f
author Kenny Root <kroot@google.com> Wed Feb 17 10:04:20 2010 -0800
committer Kenny Root <kroot@google.com> Wed Feb 17 10:04:39 2010 -0800
tree 8d7d7338528de0f55ac75d15cdb5460846a8adf7
parent a4437fc93a993c7ab326b592d22c05be2f11b543

Prevent possible NPE in android.gesture.Learner

Change-Id: If9b0ac9a05b6736719d84c6b58be73e3f7771f07

core/java/android/gesture/Learner.java

diff --git a/core/java/android/gesture/Learner.java b/core/java/android/gesture/Learner.java
index 60997e0..a105652 100755
--- a/core/java/android/gesture/Learner.java
+++ b/core/java/android/gesture/Learner.java
@@ -72,7 +72,8 @@
         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);
             }
         }