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

Commit 336a7e7c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixup ModifierShortcutManager#getApplicatioNShortcuts on HSUM" into main

parents 6b1fe0e1 18486b79

services/core/java/com/android/server/policy/ModifierShortcutManager.java

+3 −1
Original line number Diff line number Diff line
@@ -667,9 +667,11 @@ public class ModifierShortcutManager { 
    public KeyboardShortcutGroup getApplicationLaunchKeyboardShortcuts(int deviceId) {

        List<KeyboardShortcutInfo> shortcuts = new ArrayList();

        if (modifierShortcutManagerRefactor()) {

            Context context = modifierShortcutManagerMultiuser()

                    ? mContext.createContextAsUser(mCurrentUser, 0) : mContext;

            for (Bookmark b : mBookmarks.values()) {

                KeyboardShortcutInfo info = shortcutInfoFromIntent(

                        b.getShortcutChar(), b.getIntent(mContext), b.isShift());

                        b.getShortcutChar(), b.getIntent(context), b.isShift());

                if (info != null) {

                    shortcuts.add(info);

                }