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

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

Merge "Always restore staged sessions on boot." into qt-dev am: f3c1480e 

am: e7037151

Change-Id: I1418be1b6a7b669c5a7b999b61dba4e357ca7646
parents a967c048 e7037151

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

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

                                System.currentTimeMillis() - session.getUpdatedMillis();

                        final boolean valid;

                        final boolean valid;

                        if (session.isStaged()) {

                        if (session.isStaged()) {

                            if (timeSinceUpdate >= MAX_TIME_SINCE_UPDATE_MILLIS

                            if (timeSinceUpdate >= MAX_TIME_SINCE_UPDATE_MILLIS) {

                                    && session.isStagedAndInTerminalState()) {

                                valid = false;

                                valid = false;

                            } else {

                            } else {

                                valid = true;

                                valid = true;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1150,7 +1150,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
     */

     */

    void sealAndValidateIfNecessary() {

    void sealAndValidateIfNecessary() {

        synchronized (mLock) {

        synchronized (mLock) {

            if (!mShouldBeSealed) {

            if (!mShouldBeSealed || isStagedAndInTerminalState()) {

                return;

                return;

            }

            }

        }

        }