commit 606726ba289583a67188d9448b220c2e3fae87d7
author Sunny Goyal <sunnygoyal@google.com> Thu Sep 03 17:12:36 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 03 17:12:36 2015 +0000
tree a8c0c0f936d7660d7ec5383336d36f6bbcd6fea9
parent 667d6888f4a7f1a6267c1968f22fdb8ff3af8d34
parent a75053f5f90b9494cc60a99e2b80b419eb3724b9

Merge "Preventing null pointer crash when opening a folder" into ub-launcher3-burnaby

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 44d70ba..856e3b8 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -4089,7 +4089,7 @@
 
             @Override
             public boolean evaluate(ItemInfo info, View v, View parent) {
-                return info.id == id;
+                return info != null && info.id == id;
             }
         });
     }