commit d25023b05eadb2e907031889f50e3fd87506d20c
author Pinyao Ting <pinyaoting@google.com> Thu Mar 19 12:28:24 2020 -0700
committer Pinyao Ting <pinyaoting@google.com> Mon Mar 23 17:49:34 2020 +0000
tree 32bd90fed112ea615f87c60f5bbec329676bb485
parent 0465b4d71e83c97163063d4cde2f7568cca36eba

Parse share-targets defined by non-main activities

Some system apps do not have any launcher icons but want to publish
sharing shortcuts. As a fix, all activities are parsed for their XML
resource, which implies some of these shortcut may not hold an
activity. This CL removes that assumption from launcher side.

Bug: 136353429
Test: Manual test
Change-Id: I2994da17fe078b2fab61a614c1326fddd5fd8571

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());