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

Merge changes from topic "presubmit-am-b5e39839c1434267a07590be6e0b1b91" into sc-v2-dev-plus-aosp

Browse Source 
* changes:
  [automerge] Fix NPE 2p: 18179a8762
  Fix NPE
This commit is contained in:
Songchun Fan
2022-04-06 00:35:03 +00:00
committed by Android (Google) Code Review
parent da03dfd061 789aab93bd
commit e70eb23c26
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

@@ -394,7 +394,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 {