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

Commit 1e4250df authored by Felipe Leme's avatar Felipe Leme
Browse files

resolve merge conflicts of e7f9de78 to master

Change-Id: Ib28b9e0902c1e5ec29efa3764650b9d13b2372c7
parents 18d6db9a e7f9de78
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -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,