commit 7a84dd66f659f35f706e8d57b7f22c9444437b22
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Mar 23 18:27:27 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 23 18:27:27 2020 +0000
tree 2ef10bbdea60f92dccce9df6fe878047eb28f2fa
parent 7a9f1628f2dad51e9a1f7e5e18aacb528ef0d48f
parent d25023b05eadb2e907031889f50e3fd87506d20c

Merge "Parse share-targets defined by non-main activities" into ub-launcher3-master

src/com/android/launcher3/model/BgDataModel.java

diff --git a/src/com/android/launcher3/model/BgDataModel.java b/src/com/android/launcher3/model/BgDataModel.java
index 32fce0b..fdfcef1 100644
--- a/src/com/android/launcher3/model/BgDataModel.java
+++ b/src/com/android/launcher3/model/BgDataModel.java
@@ -424,7 +424,8 @@
         // Now add the new shortcuts to the map.
         for (ShortcutInfo shortcut : shortcuts) {
             boolean shouldShowInContainer = shortcut.isEnabled()
-                    && (shortcut.isDeclaredInManifest() || shortcut.isDynamic());
+                    && (shortcut.isDeclaredInManifest() || shortcut.isDynamic())
+                    && shortcut.getActivity() != null;
             if (shouldShowInContainer) {
                 ComponentKey targetComponent
                         = new ComponentKey(shortcut.getActivity(), shortcut.getUserHandle());