resolve merge conflicts of e7f9de7 to master

Change-Id: Ib28b9e0902c1e5ec29efa3764650b9d13b2372c7
2016-06-21 15:46:48 -07:00
parent 18d6db9a68 e7f9de7875
commit 1e4250df55
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/pm/LauncherAppsService.java
+++ b/services/core/java/com/android/server/pm/LauncherAppsService.java
@@ -380,6 +380,7 @@ public class LauncherAppsService extends SystemService {
                        "To query by shortcut ID, package name must also be set");
            }

+            // TODO(b/29399275): Eclipse compiler requires explicit List<ShortcutInfo> cast below.
            return new ParceledListSlice<>((List<ShortcutInfo>)
                    mShortcutServiceInternal.getShortcuts(getCallingUserId(),
                            callingPackage, changedSince, packageName, shortcutIds,