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

Commit f3c1480e authored May 09, 2019 by Dario Freni Committed by Android (Google) Code Review May 09, 2019

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

parents 52ce3686 f2449f7c

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -363,8 +363,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
		System.currentTimeMillis() - session.getUpdatedMillis();
		final boolean valid;
		if (session.isStaged()) {
		if (timeSinceUpdate >= MAX_TIME_SINCE_UPDATE_MILLIS
		&& session.isStagedAndInTerminalState()) {
		if (timeSinceUpdate >= MAX_TIME_SINCE_UPDATE_MILLIS) {
		valid = false;
		} else {
		valid = true;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1150,7 +1150,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		*/
		void sealAndValidateIfNecessary() {
		synchronized (mLock) {
		if (!mShouldBeSealed) {
		if (!mShouldBeSealed \|\| isStagedAndInTerminalState()) {
		return;
		}
		}