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

Commit e7037151 authored May 09, 2019 by Dario Freni Committed by android-build-merger May 09, 2019

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

am: f3c1480e

Change-Id: I63a6d57fd40998656ffc8495422aa0ae86a87332

parents 4d982939 f3c1480e

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;
		}
		}