Merge changes from topic "cp-fingerprint" into qt-qpr1-dev am: cc07b65678 (8db07a5d) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -259,7 +259,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
	// Don't hold mSessions lock when calling restoreSession, since it might trigger an APK		// Don't hold mSessions lock when calling restoreSession, since it might trigger an APK
	// atomic install which needs to query sessions, which requires lock on mSessions.		// atomic install which needs to query sessions, which requires lock on mSessions.
	for (PackageInstallerSession session : stagedSessionsToRestore) {		for (PackageInstallerSession session : stagedSessionsToRestore) {
	if (mPm.isDeviceUpgrading()) {		if (mPm.isDeviceUpgrading() && !session.isStagedAndInTerminalState()) {
	session.setStagedSessionFailed(SessionInfo.STAGED_SESSION_ACTIVATION_FAILED,		session.setStagedSessionFailed(SessionInfo.STAGED_SESSION_ACTIVATION_FAILED,
	"Build fingerprint has changed");		"Build fingerprint has changed");
	}		}