From 41b10f846d432dba9a9e04da2321244c663a38fa Mon Sep 17 00:00:00 2001
From: Mehdi Alizadeh <mett@google.com>
Date: Tue, 28 Apr 2020 21:37:47 -0700
Subject: [PATCH] Allows pinned-only shortcuts to get cached

Bug: 154663170
Test: atest com.android.server.pm.ShortcutManagerTest1
            com.android.server.pm.ShortcutManagerTest2
            com.android.server.pm.ShortcutManagerTest3
            com.android.server.pm.ShortcutManagerTest4
            com.android.server.pm.ShortcutManagerTest5
            com.android.server.pm.ShortcutManagerTest6
            com.android.server.pm.ShortcutManagerTest7
            com.android.server.pm.ShortcutManagerTest8
            com.android.server.pm.ShortcutManagerTest9
            com.android.server.pm.ShortcutManagerTest10
            com.android.server.pm.ShortcutManagerTest11
Change-Id: I19afdd0347a1f69a632293aa22108d54f387f268
---
 .../core/java/com/android/server/pm/ShortcutService.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java
index e4ae007dadee3..d03442b06ff37 100644
--- a/services/core/java/com/android/server/pm/ShortcutService.java
+++ b/services/core/java/com/android/server/pm/ShortcutService.java
@@ -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;