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

Commit 693fef41 authored by Mehdi Alizadeh's avatar Mehdi Alizadeh Committed by Automerger Merge Worker
Browse files

Merge "Allows pinned-only shortcuts to get cached" into rvc-dev am: 6184b48e...

Merge "Allows pinned-only shortcuts to get cached" into rvc-dev am: 6184b48e am: 08051835 am: c5ee590e am: 6abe59be

Change-Id: I59228a26114b98c1f7238ae7f7c4ae06a261aea9
parents 59d38b05 6abe59be
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -3115,15 +3115,15 @@ public class ShortcutService extends IShortcutService.Stub {
                    }

                    if (doCache) {
                        if (si.isDynamic() && si.isLongLived()) {
                        if (si.isLongLived()) {
                            si.addFlags(ShortcutInfo.FLAG_CACHED);
                            if (changedShortcuts == null) {
                                changedShortcuts = new ArrayList<>(1);
                            }
                            changedShortcuts.add(si);
                        } else {
                            Log.w(TAG, "Only dynamic long lived shortcuts can get cached. Ignoring"
                                    + "shortcut " + si.getId());
                            Log.w(TAG, "Only long lived shortcuts can get cached. Ignoring id "
                                    + si.getId());
                        }
                    } else {
                        ShortcutInfo removed = null;