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

Commit 40af11f8 authored by JW Wang's avatar JW Wang
Browse files

Merge streamValidateAndCommit() and streamAndValidateLocked() (2/n) 

Also move mStagingManager.checkNonOverlappingWithStagedSessions() outside
the lock. It is safe to do so since it accesses members which are immutable
after calls to validate[Apex|Apk]InstallLocked().

Now all calls to StagingManager are done outside the lock.

Bug: 161765186
Test: atest StagedInstallTest AtomicInstallTest StagedInstallInternalTest
Change-Id: I0d7cbe83a117a2d01eedc089a34778739d5fee36
parent e6542d04

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

+40 −51
Original line number Diff line number Diff line
@@ -249,6 +249,9 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
    private final PackageManagerService mPm;

    private final Handler mHandler;

    private final PackageSessionProvider mSessionProvider;

    /**

     * Note all calls must be done outside {@link #mLock} to prevent lock inversion.

     */

    private final StagingManager mStagingManager;



    final int sessionId;
@@ -1468,15 +1471,32 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        // TODO(patb): since the work done here for a parent session in a multi-package install is

        //             mostly superficial, consider splitting this method for the parent and

        //             single / child sessions.

        try {

            synchronized (mLock) {

                if (mCommitted) {

                    return true;

                }



            if (!streamAndValidateLocked()) {

                // Read transfers from the original owner stay open, but as the session's data

                // cannot be modified anymore, there is no leak of information. For staged sessions,

                // further validation is performed by the staging manager.

                if (!params.isMultiPackage) {

                    if (!prepareDataLoaderLocked()) {

                        return false;

                    }



                    if (isApexInstallation()) {

                        validateApexInstallLocked();

                    } else {

                        validateApkInstallLocked();

                    }

                }

            }



            if (params.isStaged) {

                mStagingManager.checkNonOverlappingWithStagedSessions(this);

            }



            synchronized (mLock) {

                // Client staging is fully done at this point

                mClientProgress = 1f;

                computeProgressLocked(true);
@@ -1488,6 +1508,13 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
                mCommitted = true;

            }

            return true;

        } catch (PackageManagerException e) {

            throw onSessionValidationFailure(e);

        } catch (Throwable e) {

            // Convert all exceptions into package manager exceptions as only those are handled

            // in the code above.

            throw onSessionValidationFailure(new PackageManagerException(e));

        }

    }



    @GuardedBy("mLock")
@@ -1525,44 +1552,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        }

    }



    /**

     * Prepare DataLoader and stream content for DataLoader sessions.

     * Validate the contents of all session.

     *

     * @return false if the data loader could not be prepared.

     * @throws PackageManagerException when an unrecoverable exception is encountered

     */

    @GuardedBy("mLock")

    private boolean streamAndValidateLocked() throws PackageManagerException {

        try {

            // Read transfers from the original owner stay open, but as the session's data cannot

            // be modified anymore, there is no leak of information. For staged sessions, further

            // validation is performed by the staging manager.

            if (!params.isMultiPackage) {

                if (!prepareDataLoaderLocked()) {

                    return false;

                }



                if (isApexInstallation()) {

                    validateApexInstallLocked();

                } else {

                    validateApkInstallLocked();

                }

            }



            if (params.isStaged) {

                mStagingManager.checkNonOverlappingWithStagedSessions(this);

            }

            return true;

        } catch (PackageManagerException e) {

            throw onSessionValidationFailure(e);

        } catch (Throwable e) {

            // Convert all exceptions into package manager exceptions as only those are handled

            // in the code above.

            throw onSessionValidationFailure(new PackageManagerException(e));

        }

    }



    private PackageManagerException onSessionValidationFailure(PackageManagerException e) {

        onSessionValidationFailure(e.error, ExceptionUtils.getCompleteMessage(e));

        return e;