summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Birg <roman@cyngn.com>2014-06-16 13:18:06 -0700
committerRoman Birg <roman@cyngn.com>2014-06-16 13:18:06 -0700
commit5b2ed54a3d4249c90e2d2cdf1863979c0a671980 (patch)
tree97322733db01d2283baf975b49a366ac21dcb540
parent42c18d681ff3ab49d9f34e3cebd08fc91bcf08d8 (diff)
downloadandroid_packages_apps_Trebuchet-5b2ed54a3d4249c90e2d2cdf1863979c0a671980.tar.gz
android_packages_apps_Trebuchet-5b2ed54a3d4249c90e2d2cdf1863979c0a671980.tar.bz2
android_packages_apps_Trebuchet-5b2ed54a3d4249c90e2d2cdf1863979c0a671980.zip
Trebuchet: don't crash when updating the "All apps" shortcut
Change-Id: I2afd3e1c8a73248c2b657585739813b1a894a7f6 Signed-off-by: Roman Birg <roman@cyngn.com>
-rw-r--r--src/com/android/launcher3/Workspace.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index f3dee8dc2..008dc1527 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -4789,6 +4789,10 @@ public class Workspace extends SmoothPagedView
private void updateShortcut(HashMap<ComponentName, AppInfo> appsMap, ItemInfo info,
View child) {
+ if (info.getIntent() == null) {
+ // it's the all-apps shortcut, don't crash!
+ return;
+ }
ComponentName cn = info.getIntent().getComponent();
if (info.getRestoredIntent() != null) {
cn = info.getRestoredIntent().getComponent();