From 35da764125727eb1c14651b35b7dc15f1e199c8a Mon Sep 17 00:00:00 2001 From: JW Wang Date: Tue, 28 Jul 2020 12:49:30 +0800 Subject: [PATCH] Fix #addChildSessionId (2/n) A multi-session can't be a child. Bug: 162286562 Test: Will be added in next CLs Change-Id: I7e9957f0cd57fe924cfb5ba8f0cfb27b045f26dc --- .../java/com/android/server/pm/PackageInstallerSession.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java index 2a10a1959c433..ff96c9173d594 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerSession.java +++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java @@ -3101,6 +3101,10 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { throw new IllegalStateException("Unable to add child session " + childSessionId + " as it does not exist."); } + if (childSession.params.isMultiPackage) { + throw new IllegalStateException("Multi-session " + childSessionId + + " can't be a child."); + } try { acquireTransactionLock();