From a4945fcf4b29e6728ce8bae3970f42a75898d0e2 Mon Sep 17 00:00:00 2001 From: Songchun Fan Date: Tue, 28 Jun 2022 01:06:53 +0000 Subject: [PATCH] [RESTRICT AUTOMERGE] Revert "Fix NPE" This reverts commit f562aadd77298ec019dc410e395a512bbb57c720. Reason for revert: Reverting CVE-2021-39624 on qt-dev Change-Id: Ida84f497eb188b4923acbe8acdbe4d47427aa24e --- .../java/com/android/server/pm/PackageInstallerService.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java index 3f6ebecdcf0f8..7c1ac2737469a 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerService.java +++ b/services/core/java/com/android/server/pm/PackageInstallerService.java @@ -332,10 +332,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements // Their staging dirs will be removed too PackageInstallerSession root = !session.hasParentSessionId() ? session : mSessions.get(session.getParentSessionId()); - if (root == null) { - Slog.e(TAG, "freeStageDirs: found an orphaned session: " - + session.sessionId + " parent=" + session.getParentSessionId()); - } else if (!root.isDestroyed() && + if (!root.isDestroyed() && (!root.isStaged() || (root.isStaged() && root.isStagedSessionReady()))) { root.abandon();