commit | f02f774e2463e18ea3b9e084f0f47d7cc70da727 | [log] [tgz] |
---|---|---|
author | Zhi Dou <zhidou@google.com> | Fri Jan 20 15:46:32 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 20 15:46:32 2023 +0000 |
tree | f7d93006aad97e5ffe79d0a1a330d4cee7dcd48c | |
parent | fda52cfa61556cc870ff5bd370a426a78bc4b8ef [diff] | |
parent | fea0bb71352dbc0292ab20ad4b23489fdaf52aab [diff] |
Merge "Creat hardlink if active apexes are in the same partition" am: fea0bb7135 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2372652 Change-Id: I9477ba59572ff2fdc1d526b049d9966f8e2db808 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/rollback/RollbackStore.java b/services/core/java/com/android/server/rollback/RollbackStore.java index f973f5c..8068c6f 100644 --- a/services/core/java/com/android/server/rollback/RollbackStore.java +++ b/services/core/java/com/android/server/rollback/RollbackStore.java
@@ -249,7 +249,7 @@ targetDir.mkdirs(); File targetFile = new File(targetDir, sourceFile.getName()); - boolean fallbackToCopy = !isLinkPossible(sourceFile, targetFile); + boolean fallbackToCopy = !isLinkPossible(sourceFile, targetDir); if (!fallbackToCopy) { try { // Create a hard link to avoid copy