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

Commit 3e5229be authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[pm] fix progress on commit for non-incremental apps" into sc-dev am: b6553f06 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13934022

Change-Id: I1ec51d02502cf48380baefeaba5d309a884cbaef
parents a6c3350f b6553f06

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

+9 −3
Original line number Diff line number Diff line
@@ -1207,12 +1207,18 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            mProgress = MathUtils.constrain(mClientProgress * 0.8f, 0f, 0.8f)

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

        } else {

            // For incremental installs, continue publishing the install progress during committing.

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

            if (isIncrementalInstallation() && (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.

                // This way we don't see the progress ring going backwards.

                mProgress = mIncrementalProgress;

            }

        }



        // Only publish when meaningful change

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

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

            mReportedProgress = mProgress;

            mCallback.onSessionProgressChanged(this, mProgress);

        }