commit 0c0f83902d973d62e4dbb9cdf73440d5ef7b0b49
author Yurii Zubrytskyi <zyy@google.com> Tue Dec 08 07:33:37 2020 -0800
committer Yurii Zubrytskyi <zyy@google.com> Tue Jan 19 10:30:14 2021 -0800
tree 0c34d3b2c46a37322ac8ba5e7bfd6e87b9ab2128
parent 2e21f27348735368d705a97b889ae251f254b16e

IncFS: pass over the new .blocks_written IncFS control file

Bug: 170231230
Test: incremental and PackageManager unit tests
Ignore-AOSP-First: new IncFS API is an internal-first topic
Change-Id: I7fccaf367d4b98294e2e6da4460792514147d954

VoldNativeService.cpp

diff --git a/VoldNativeService.cpp b/VoldNativeService.cpp
index 03dee48..7a6ceff 100644
--- a/VoldNativeService.cpp
+++ b/VoldNativeService.cpp
@@ -920,6 +920,9 @@
     _aidl_return->cmd.reset(unique_fd(fds[CMD].release()));
     _aidl_return->pendingReads.reset(unique_fd(fds[PENDING_READS].release()));
     _aidl_return->log.reset(unique_fd(fds[LOGS].release()));
+    if (fds[BLOCKS_WRITTEN].ok()) {
+        _aidl_return->blocksWritten.emplace(unique_fd(fds[BLOCKS_WRITTEN].release()));
+    }
     return Ok();
 }
 
@@ -936,7 +939,8 @@
     ENFORCE_SYSTEM_OR_ROOT;
 
     auto incfsControl =
-            incfs::createControl(control.cmd.get(), control.pendingReads.get(), control.log.get());
+            incfs::createControl(control.cmd.get(), control.pendingReads.get(), control.log.get(),
+                                 control.blocksWritten ? control.blocksWritten->get() : -1);
     auto cleanupFunc = [](auto incfsControl) {
         for (auto& fd : incfsControl->releaseFds()) {
             (void)fd.release();