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

Commit 63672962 authored by Mohammad Samiul Islam's avatar Mohammad Samiul Islam
Browse files

Revert "Re-seal the sessions on reboot." 

This reverts commit 595db8a1.

Reason for revert: b/147985998

Bug: 147985998
Test: StagedRollbackTest#testRollbackApexWithApk
Change-Id: I0f2b2dfb82aa7535f7fe9d4011f07fdb80f9e383
parent 595db8a1

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

+2 −2
Original line number Diff line number Diff line
@@ -400,10 +400,10 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 
        } finally {

            IoUtils.closeQuietly(fis);

        }

        // Re-sealing the sealed sessions.

        // After all of the sessions were loaded, they are ready to be sealed and validated

        for (int i = 0; i < mSessions.size(); ++i) {

            PackageInstallerSession session = mSessions.valueAt(i);

            session.sealIfNecessary();

            session.sealAndValidateIfNecessary();

        }

    }

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

+8 −4
Original line number Diff line number Diff line
@@ -1374,13 +1374,15 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
    }



    /**

     * If session should be sealed, then it's sealed to prevent further modification.

     * If the session can't be sealed then it's destroyed.

     * If session should be sealed, then it's sealed to prevent further modification

     * and then it's validated.

     *

     * If the session was sealed but something went wrong then it's destroyed.

     *

     * <p> This is meant to be called after all of the sessions are loaded and added to

     * PackageInstallerService

     */

    void sealIfNecessary() {

    void sealAndValidateIfNecessary() {

        synchronized (mLock) {

            if (!mShouldBeSealed || isStagedAndInTerminalState()) {

                return;
@@ -1389,7 +1391,9 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        List<PackageInstallerSession> childSessions = getChildSessions();

        synchronized (mLock) {

            try {

                sealLocked(childSessions);

                sealAndValidateLocked(childSessions);

            } catch (StreamingException e) {

                Slog.e(TAG, "Streaming failed", e);

            } catch (PackageManagerException e) {

                Slog.e(TAG, "Package not valid", e);

            }