Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE" into sc-qpr1-dev am: f8e5b63d26

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

Change-Id: I719f8f01e809480fc857612f77aefd13c3c22ca5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-06 00:12:30 +00:00
committed by Automerger Merge Worker
parent 117fe27f96 f8e5b63d26
commit df4fd53f37
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/pm/PackageInstallerService.java
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 {