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

Commit cc07b656 authored by Gavin Corkery's avatar Gavin Corkery Committed by Android (Google) Code Review
Browse files

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

* changes:
  Don't mark terminal staged sessions as failed
  Add build fingerprint checks to APK sessions
parents 0416784c d0ae5c22

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

+4 −0
Original line number Diff line number Diff line
@@ -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

        // atomic install which needs to query sessions, which requires lock on mSessions.

        for (PackageInstallerSession session : stagedSessionsToRestore) {

            if (mPm.isDeviceUpgrading() && !session.isStagedAndInTerminalState()) {

                session.setStagedSessionFailed(SessionInfo.STAGED_SESSION_ACTIVATION_FAILED,

                        "Build fingerprint has changed");

            }

            mStagingManager.restoreSession(session);

        }

        // Broadcasts are not sent while we restore sessions on boot, since no processes would be