Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7f9de78 authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

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

am: bede3bfb

Change-Id: I2f562b577d520a7fc9f90cd952a735f2ee8f8f24
parents 80f0d0f2 bede3bfb

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

+2 −1
Original line number Diff line number Diff line
@@ -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()));