summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-09-03 17:12:36 (GMT)
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-09-03 17:12:36 (GMT)
commit606726ba289583a67188d9448b220c2e3fae87d7 (patch)
treea8c0c0f936d7660d7ec5383336d36f6bbcd6fea9
parent667d6888f4a7f1a6267c1968f22fdb8ff3af8d34 (diff)
parenta75053f5f90b9494cc60a99e2b80b419eb3724b9 (diff)
downloadandroid_packages_apps_Trebuchet-606726ba289583a67188d9448b220c2e3fae87d7.zip
android_packages_apps_Trebuchet-606726ba289583a67188d9448b220c2e3fae87d7.tar.gz
android_packages_apps_Trebuchet-606726ba289583a67188d9448b220c2e3fae87d7.tar.bz2
Merge "Preventing null pointer crash when opening a folder" into ub-launcher3-burnaby
-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;
}
});
}