Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "cp-fingerprint" into qt-qpr1-dev

Browse Source 
* changes:
  Don't mark terminal staged sessions as failed
  Add build fingerprint checks to APK sessions
This commit is contained in:
Gavin Corkery
2019-12-18 17:56:24 +00:00
committed by Android (Google) Code Review
parent 0416784c2e d0ae5c22d5
commit cc07b65678
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/PackageInstallerService.java
View File

@@ -259,6 +259,10 @@ 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() && !session.isStagedAndInTerminalState()) {
session.setStagedSessionFailed(SessionInfo.STAGED_SESSION_ACTIVATION_FAILED,
"Build fingerprint has changed");
}
mStagingManager.restoreSession(session); mStagingManager.restoreSession(session);
} }
// Broadcasts are not sent while we restore sessions on boot, since no processes would be // Broadcasts are not sent while we restore sessions on boot, since no processes would be