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

Commit dd2b4a00 authored by Songchun Fan's avatar Songchun Fan
Browse files

[pm] fix non-incremental install progress regression 

Previously we introduced a regression by neglecting the fact that a
non-incremental install also publishes a progress update after the
session is committed, which updates the progress to 90%.

Test: manual
BUG: 182698653
Change-Id: I0bd433fc8b81545890d60f0146215d8e15e234bb
parent 84209e12

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

+5 −4
Original line number Diff line number Diff line
@@ -1265,12 +1265,13 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 


    @GuardedBy("mProgressLock")

    private void computeProgressLocked(boolean forcePublish) {

        if (!mCommitted) {

        if (!isIncrementalInstallation() || !mCommitted) {

            mProgress = MathUtils.constrain(mClientProgress * 0.8f, 0f, 0.8f)

                    + MathUtils.constrain(mInternalProgress * 0.2f, 0f, 0.2f);

        } else {

            // For incremental install, continue to publish incremental progress during committing.

            if (isIncrementalInstallation() && (mIncrementalProgress - mProgress) >= 0.01) {

            // For incremental, publish regular install progress before the session is committed,

            // but publish incremental progress afterwards.

            if (mIncrementalProgress - mProgress >= 0.01) {

                // It takes some time for data loader to write to incremental file system, so at the

                // beginning of the commit, the incremental progress might be very small.

                // Wait till the incremental progress is larger than what's already displayed.
@@ -1279,7 +1280,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            }

        }



        // Only publish when meaningful change

        // Only publish meaningful progress changes.

        if (forcePublish || (mProgress - mReportedProgress) >= 0.01) {

            mReportedProgress = mProgress;

            mCallback.onSessionProgressChanged(this, mProgress);