Loading services/core/java/com/android/server/pm/StagingManager.java +4 −4 Original line number Diff line number Diff line Loading @@ -970,19 +970,19 @@ public class StagingManager { // name and the session we are checking is not a parent session either. continue; } // From here on, stagedSession is a non-parent active staged session // Check if stagedSession has an active parent session or not if (stagedSession.hasParentSessionId()) { int parentId = stagedSession.getParentSessionId(); PackageInstallerSession parentSession = mStagedSessions.get(parentId); if (parentSession == null || parentSession.isStagedAndInTerminalState()) { if (parentSession == null || parentSession.isStagedAndInTerminalState() || parentSession.isDestroyed()) { // Parent session has been abandoned or terminated already continue; } } // From here on, stagedSession is a non-parent active staged session // Check if session is one of the active sessions if (session.sessionId == stagedSession.sessionId) { Slog.w(TAG, "Session " + session.sessionId + " is already staged"); Loading Loading
services/core/java/com/android/server/pm/StagingManager.java +4 −4 Original line number Diff line number Diff line Loading @@ -970,19 +970,19 @@ public class StagingManager { // name and the session we are checking is not a parent session either. continue; } // From here on, stagedSession is a non-parent active staged session // Check if stagedSession has an active parent session or not if (stagedSession.hasParentSessionId()) { int parentId = stagedSession.getParentSessionId(); PackageInstallerSession parentSession = mStagedSessions.get(parentId); if (parentSession == null || parentSession.isStagedAndInTerminalState()) { if (parentSession == null || parentSession.isStagedAndInTerminalState() || parentSession.isDestroyed()) { // Parent session has been abandoned or terminated already continue; } } // From here on, stagedSession is a non-parent active staged session // Check if session is one of the active sessions if (session.sessionId == stagedSession.sessionId) { Slog.w(TAG, "Session " + session.sessionId + " is already staged"); Loading