Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 825fa933 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I811bbe7d8b1ab864f8af45a60b8e1a919dc08013
parents 9a354eac 01464a1b

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

+4 −1
Original line number Diff line number Diff line
@@ -17,8 +17,10 @@ package com.android.settings.notification; 


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 @@ public class NotificationBackend { 


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