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

Merge "Allow staging multi-package session immediately after abandonment" into rvc-dev

Browse Source
This commit is contained in:
Mohammad Samiul Islam
2020-06-22 08:20:11 +00:00
committed by Android (Google) Code Review
parent 7a65a7a37c 806ccabb73
commit fb11084bc6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/pm/StagingManager.java
View File

@@ -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");