PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ia18605f157581a2c1baf9d2fabac9f8f0631243e
This commit is contained in:
TreeHugger Robot
2020-06-08 22:26:28 +00:00
committed by Automerger Merge Worker
parent 56a1f8af20 cc2652c5e9
commit 0a93295af2
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/notification/NotificationBackend.java
View File

@@ -17,8 +17,10 @@ package com.android.settings.notification;
import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.app.NotificationManager.IMPORTANCE_NONE;
import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; 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_DYNAMIC;
import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED; 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.INotificationManager;
import android.app.NotificationChannel; import android.app.NotificationChannel;
@@ -544,7 +546,8 @@ public class NotificationBackend {
LauncherApps.ShortcutQuery query = new LauncherApps.ShortcutQuery() LauncherApps.ShortcutQuery query = new LauncherApps.ShortcutQuery()
.setPackage(pkg) .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)); .setShortcutIds(Arrays.asList(id));
List<ShortcutInfo> shortcuts = la.getShortcuts( List<ShortcutInfo> shortcuts = la.getShortcuts(
query, UserHandle.of(UserHandle.getUserId(uid))); query, UserHandle.of(UserHandle.getUserId(uid)));