commit 0a93295af24bc8e4535004cf9adeea949450f1c7
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 08 22:26:28 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 08 22:26:28 2020 +0000
tree 4b8033fac87fb6bff831fe98fbaaf206fd4de8b7
parent 56a1f8af2057cf4f7a966e7dd2a4c214f9cd789a
parent cc2652c5e96dcdfe9890ad865d839d3853a5977b

Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: cc2652c5e9

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: Ia18605f157581a2c1baf9d2fabac9f8f0631243e

src/com/android/settings/notification/NotificationBackend.java

diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index 483e8aa..e23e4a5 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -17,8 +17,10 @@
 
 import static android.app.NotificationManager.IMPORTANCE_NONE;
 import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
+import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_CACHED;
 import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_DYNAMIC;
 import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED;
+import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED_BY_ANY_LAUNCHER;
 
 import android.app.INotificationManager;
 import android.app.NotificationChannel;
@@ -544,7 +546,8 @@
 
         LauncherApps.ShortcutQuery query = new LauncherApps.ShortcutQuery()
                 .setPackage(pkg)
-                .setQueryFlags(FLAG_MATCH_DYNAMIC | FLAG_MATCH_PINNED)
+                .setQueryFlags(FLAG_MATCH_DYNAMIC
+                        | FLAG_MATCH_PINNED_BY_ANY_LAUNCHER | FLAG_MATCH_CACHED)
                 .setShortcutIds(Arrays.asList(id));
         List<ShortcutInfo> shortcuts = la.getShortcuts(
                 query, UserHandle.of(UserHandle.getUserId(uid)));