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

Commit a4945fcf authored by Songchun Fan's avatar Songchun Fan
Browse files

[RESTRICT AUTOMERGE] Revert "Fix NPE" 

This reverts commit f562aadd.

Reason for revert: Reverting CVE-2021-39624 on qt-dev

Change-Id: Ida84f497eb188b4923acbe8acdbe4d47427aa24e
parent f562aadd

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

+1 −4
Original line number Diff line number Diff line
@@ -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();