commit 16c3ec7781d790343090859cb0c493c56193f5dc
author JW Wang <wangchun@google.com> Tue Dec 15 15:34:48 2020 +0800
committer JW Wang <wangchun@google.com> Thu Dec 17 11:39:16 2020 +0800
tree 07af177c15ddccf5a9c1c15f44c6fba674cb67b4
parent 2cf104161fcd842334b9ed57aa36f76e3019fbf1

Some cleanup (3/n)

Bug: 166694095
Test: atest StagedInstallTest
Change-Id: Ibbf7f77ca512498c7b4b3080a11174ac96bb932c

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

diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java
index 41eb3bc..4fe72c2 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 @@
         @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 void verifySession() {
             assertCallerIsOwnerOrRootOrSystemLocked();
             Preconditions.checkArgument(isCommitted());
-            Preconditions.checkArgument(isStaged());
             Preconditions.checkArgument(!mSessionApplied && !mSessionFailed);
             verify();
         }