[automerge] Fix NPE 2p: 73d533592a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17592027

Bug: 227342978
Change-Id: If0eec5515688f547455fe932360c60b9c7047e6c
Merged-In: Ia21323926bd9db1a6f05461904deb45b4c3dd0bc
This commit is contained in:
Presubmit Automerger Backend
2022-04-05 19:54:24 +00:00

View File

@@ -390,7 +390,10 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
// Their staging dirs will be removed too // Their staging dirs will be removed too
PackageInstallerSession root = !session.hasParentSessionId() PackageInstallerSession root = !session.hasParentSessionId()
? session : mSessions.get(session.getParentSessionId()); ? session : mSessions.get(session.getParentSessionId());
if (!root.isDestroyed()) { if (root == null) {
Slog.e(TAG, "freeStageDirs: found an orphaned session: "
+ session.sessionId + " parent=" + session.getParentSessionId());
} else if (!root.isDestroyed()) {
root.abandon(); root.abandon();
} }
} else { } else {