From b02e7b698e6541939b2b82b00b6671317912afad Mon Sep 17 00:00:00 2001
From: Alex Buynytskyy <alexbuy@google.com>
Date: Thu, 11 Feb 2021 19:09:10 -0800
Subject: [PATCH] Obtain incfs features early in the booting sequence.

Has to be done before SystemConfig initialization to set correct
Incremental version feature.

Bug: 180010901
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest PackageManagerServiceTest ChecksumsTest
Change-Id: I262d1f06aecb481f37bf82005c85fed02c476510
---
 VoldNativeService.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/VoldNativeService.cpp b/VoldNativeService.cpp
index 49bf4da..b7f1749 100644
--- a/VoldNativeService.cpp
+++ b/VoldNativeService.cpp
@@ -903,10 +903,16 @@ binder::Status VoldNativeService::resetCheckpoint() {
     return Ok();
 }
 
+static void initializeIncFs() {
+    // Obtaining IncFS features triggers initialization of IncFS.
+    incfs::features();
+}
+
 binder::Status VoldNativeService::earlyBootEnded() {
     ENFORCE_SYSTEM_OR_ROOT;
     ACQUIRE_LOCK;
 
+    initializeIncFs();
     Keymaster::earlyBootEnded();
     return Ok();
 }