Merge "Allows pinned-only shortcuts to get cached" into rvc-dev am: 6184b48e6e (08051835) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -3103,15 +3103,15 @@ public class ShortcutService extends IShortcutService.Stub {
	}		}

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