commit acd86ff4865323d3cf411b219b88ed084fb6fce3
author Tony <twickham@google.com> Sun Jun 26 22:16:46 2016 -0700
committer Tony Wickham <twickham@google.com> Mon Jun 27 11:53:58 2016 -0700
tree f0177e7f04878de8306e33a4f079e88a9351653a
parent 0d21daace200502c45e0c976dd6a91eea03808e0

Surround shortcut API calls with try-catch.

Bug: 29732661
Change-Id: Iba96eedab67e7715f34139c64f96b1a81ba30ea5

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 1e597d3..3e66654 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1932,10 +1932,7 @@
                                         List<ShortcutInfoCompat> fullDetails = mDeepShortcutManager
                                                 .queryForFullDetails(packageName,
                                                 Collections.singletonList(shortcutId), user);
-                                        if (fullDetails == null || fullDetails.isEmpty()) {
-                                            itemsToRemove.add(id);
-                                            continue;
-                                        } else {
+                                        if (fullDetails != null && !fullDetails.isEmpty()) {
                                             pinnedShortcut = fullDetails.get(0);
                                             shouldPin = true;
                                         }