commit 647046637efc2b7414b15062cc650cb690c01f46
author Sunny Goyal <sunnygoyal@google.com> Fri Sep 04 17:14:46 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 04 17:14:46 2015 +0000
tree bf33151ba5c0a0939c0e78f77c3cc762f600f7ce
parent f96b1ad27f1a27bd8ab0cedd35aff2dbf2495a33
parent 606726ba289583a67188d9448b220c2e3fae87d7

am 606726ba: Merge "Preventing null pointer crash when opening a folder" into ub-launcher3-burnaby

* commit '606726ba289583a67188d9448b220c2e3fae87d7':
  Preventing null pointer crash when opening a folder

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;
             }
         });
     }