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

Commit a5e21f02 authored by Dario Freni's avatar Dario Freni Committed by android-build-merger
Browse files

Merge "Preserve active staged sessions." into qt-dev 

am: ea38c4fa

Change-Id: I5a2a7f7e91161463698fd9055ab5e79c38b78e30
parents edc24c31 ea38c4fa

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

+2 −1
Original line number Diff line number Diff line
@@ -363,7 +363,8 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 
                                System.currentTimeMillis() - session.getUpdatedMillis();

                        final boolean valid;

                        if (session.isStaged()) {

                            if (timeSinceUpdate >= MAX_TIME_SINCE_UPDATE_MILLIS) {

                            if (timeSinceUpdate >= MAX_TIME_SINCE_UPDATE_MILLIS

                                    && session.isStagedAndInTerminalState()) {

                                valid = false;

                            } else {

                                valid = true;