commit 9994b2b171ab78d1d93e8a25086d6853f766e80f
author Sunny Goyal <sunnygoyal@google.com> Thu Jun 23 14:17:24 2016 -0700
committer Sunny Goyal <sunnygoyal@google.com> Thu Jun 23 14:55:56 2016 -0700
tree 52816518c6ec6adc6b2766f6a891c0b3223ad052
parent aac20dba113d3c12a964357a56b0c2dfb9dcb0d7

Making some shortcut manager calls protected by MR1 version check

Change-Id: Ifdfa95a58aa18a825c1838c61055928dbe0ea3be

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 8e404a7..1e597d3 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1941,8 +1941,8 @@
                                         }
                                     }
                                     incrementPinnedShortcutCount(key, shouldPin);
-                                    info = ShortcutInfo.fromDeepShortcutInfo(pinnedShortcut,
-                                            context, launcherApps);
+                                    info = ShortcutInfo.fromDeepShortcutInfo(
+                                            pinnedShortcut, context);
                                 } else { // item type == ITEM_TYPE_SHORTCUT
                                     info = getShortcutInfo(c, context, titleIndex, cursorIconInfo);
 
@@ -3317,7 +3317,7 @@
                 List<ShortcutInfo> shortcutInfos = idsToWorkspaceShortcutInfos
                         .get(fullDetails.getId());
                 for (ShortcutInfo shortcutInfo : shortcutInfos) {
-                    shortcutInfo.updateFromDeepShortcutInfo(fullDetails, context, mLauncherApps);
+                    shortcutInfo.updateFromDeepShortcutInfo(fullDetails, context);
                     updatedShortcutInfos.add(shortcutInfo);
                 }
             }