diff --git a/core/java/android/content/pm/IPackageInstaller.aidl b/core/java/android/content/pm/IPackageInstaller.aidl index 6daefc8b63507..ba62cd629ebbf 100644 --- a/core/java/android/content/pm/IPackageInstaller.aidl +++ b/core/java/android/content/pm/IPackageInstaller.aidl @@ -20,6 +20,7 @@ import android.content.pm.IPackageDeleteObserver2; import android.content.pm.IPackageInstallerCallback; import android.content.pm.IPackageInstallerSession; import android.content.pm.PackageInstaller; +import android.content.pm.ParceledListSlice; import android.content.IntentSender; import android.graphics.Bitmap; @@ -37,8 +38,8 @@ interface IPackageInstaller { PackageInstaller.SessionInfo getSessionInfo(int sessionId); - List getAllSessions(int userId); - List getMySessions(String installerPackageName, int userId); + ParceledListSlice getAllSessions(int userId); + ParceledListSlice getMySessions(String installerPackageName, int userId); void registerCallback(IPackageInstallerCallback callback, int userId); void unregisterCallback(IPackageInstallerCallback callback); diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java index f249c5fc56066..80efd0b221978 100644 --- a/core/java/android/content/pm/PackageInstaller.java +++ b/core/java/android/content/pm/PackageInstaller.java @@ -399,7 +399,7 @@ public class PackageInstaller { } try { - return mInstaller.getAllSessions(mUserId); + return mInstaller.getAllSessions(mUserId).getList(); } catch (RemoteException e) { throw e.rethrowAsRuntimeException(); } @@ -410,7 +410,7 @@ public class PackageInstaller { */ public @NonNull List getMySessions() { try { - return mInstaller.getMySessions(mInstallerPackageName, mUserId); + return mInstaller.getMySessions(mInstallerPackageName, mUserId).getList(); } catch (RemoteException e) { throw e.rethrowAsRuntimeException(); } diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java index 9db3fbaaff317..2150e9ab002ab 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerService.java +++ b/services/core/java/com/android/server/pm/PackageInstallerService.java @@ -45,6 +45,7 @@ import android.content.pm.PackageInstaller; import android.content.pm.PackageInstaller.SessionInfo; import android.content.pm.PackageInstaller.SessionParams; import android.content.pm.PackageManager; +import android.content.pm.ParceledListSlice; import android.graphics.Bitmap; import android.graphics.Bitmap.CompressFormat; import android.graphics.BitmapFactory; @@ -714,7 +715,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub { } @Override - public List getAllSessions(int userId) { + public ParceledListSlice getAllSessions(int userId) { mPm.enforceCrossUserPermission(Binder.getCallingUid(), userId, true, false, "getAllSessions"); final List result = new ArrayList<>(); @@ -726,11 +727,11 @@ public class PackageInstallerService extends IPackageInstaller.Stub { } } } - return result; + return new ParceledListSlice<>(result); } @Override - public List getMySessions(String installerPackageName, int userId) { + public ParceledListSlice getMySessions(String installerPackageName, int userId) { mPm.enforceCrossUserPermission(Binder.getCallingUid(), userId, true, false, "getMySessions"); mAppOps.checkPackage(Binder.getCallingUid(), installerPackageName); @@ -744,7 +745,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub { } } } - return result; + return new ParceledListSlice<>(result); } @Override