Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e70eb23c authored by Songchun Fan's avatar Songchun Fan Committed by Android (Google) Code Review
Browse files

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

* changes:
  [automerge] Fix NPE 2p: 18179a87
  Fix NPE
parents da03dfd0 789aab93

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

+4 −1
Original line number Diff line number Diff line
@@ -394,7 +394,10 @@ 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.isDestroyed()) {

                    if (root == null) {

                        Slog.e(TAG, "freeStageDirs: found an orphaned session: "

                                + session.sessionId + " parent=" + session.getParentSessionId());

                    } else if (!root.isDestroyed()) {

                        root.abandon();

                    }

                } else {