From 16c3ec7781d790343090859cb0c493c56193f5dc Mon Sep 17 00:00:00 2001
From: JW Wang <wangchun@google.com>
Date: Tue, 15 Dec 2020 15:34:48 +0800
Subject: [PATCH] Some cleanup (3/n)

Bug: 166694095
Test: atest StagedInstallTest
Change-Id: Ibbf7f77ca512498c7b4b3080a11174ac96bb932c
---
 .../java/com/android/server/pm/PackageInstallerSession.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java
index 41eb3bc2d6441..4fe72c26b7778 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerSession.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java
@@ -575,8 +575,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
         @Override
         public void installSession(IntentSender statusReceiver) {
             assertCallerIsOwnerOrRootOrSystemLocked();
-            Preconditions.checkArgument(!hasParentSessionId()); // Don't allow installing child
-                                                                // sessions
+            assertNotChildLocked("StagedSession#installSession");
             Preconditions.checkArgument(isCommitted() && isSessionReady());
 
             // Since staged sessions are installed during boot, the original reference to status
@@ -750,7 +749,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
         public void verifySession() {
             assertCallerIsOwnerOrRootOrSystemLocked();
             Preconditions.checkArgument(isCommitted());
-            Preconditions.checkArgument(isStaged());
             Preconditions.checkArgument(!mSessionApplied && !mSessionFailed);
             verify();
         }