Merge "Added explicit cast so it compiles on Eclipse." into nyc-mr1-dev

2016-06-21 20:49:28 +00:00
parent cac2dd8ce8 f93ce176de
commit bede3bfb1e
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/LauncherAppsService.java
+++ b/services/core/java/com/android/server/pm/LauncherAppsService.java
@@ -380,7 +380,8 @@ public class LauncherAppsService extends SystemService {
                        "To query by shortcut ID, package name must also be set");
            }

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