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

Commit c5ee590e 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 am: 08051835 

Change-Id: Ic290c9295faea1c695332c474a21584fac03dede
parents 3d99249d 08051835

services/core/java/com/android/server/pm/ShortcutService.java

+3 −3
Original line number Diff line number Diff line
@@ -3103,15 +3103,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;