summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-09-03 16:48:50 (GMT)
committerSunny Goyal <sunnygoyal@google.com>2015-09-03 16:48:50 (GMT)
commita75053f5f90b9494cc60a99e2b80b419eb3724b9 (patch)
tree6944f6dd157c82aa3de601fe0caebb386ba89803
parent7412c3cb005c3b3315ddb276386e2115f742d2e0 (diff)
downloadandroid_packages_apps_Trebuchet-a75053f5f90b9494cc60a99e2b80b419eb3724b9.zip
android_packages_apps_Trebuchet-a75053f5f90b9494cc60a99e2b80b419eb3724b9.tar.gz
android_packages_apps_Trebuchet-a75053f5f90b9494cc60a99e2b80b419eb3724b9.tar.bz2
Preventing null pointer crash when opening a folder
Bug: 23770713 Change-Id: I3ce82450358f1493f70639d594e1e3f391945437
-rw-r--r--src/com/android/launcher3/Workspace.java2
1 files changed, 1 insertions, 1 deletions
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 @@ public class Workspace extends PagedView
@Override
public boolean evaluate(ItemInfo info, View v, View parent) {
- return info.id == id;
+ return info != null && info.id == id;
}
});
}