Merge "[pm] fix loading progress race condition during incremental app migration" into main

2023-07-18 20:22:02 +00:00
parent b123cc0e22 0ed20c5891
commit a5cb102c26
1 changed files with 5 additions and 2 deletions
--- a/services/core/java/com/android/server/pm/PackageSetting.java
+++ b/services/core/java/com/android/server/pm/PackageSetting.java
@@ -1195,8 +1195,11 @@ public class PackageSetting extends SettingBase implements PackageStateInternal
    }

    public PackageSetting setLoadingProgress(float progress) {
-        mLoadingProgress = progress;
-        onChanged();
+        // To prevent race conditions, we don't allow progress to ever go down
+        if (mLoadingProgress < progress) {
+            mLoadingProgress = progress;
+            onChanged();
+        }
        return this;
    }