commit 7f199c623a74dcb0b1216fe3c2468de399efebc1
author Dennis Shen <dzshen@google.com> Tue Apr 09 18:41:32 2024 +0000
committer Dennis Shen <dzshen@google.com> Wed Apr 10 16:40:57 2024 +0000
tree 88f9a52551b0e4e6e3c6a9ca18b2504a4edabc87
parent 70f047b645f82f515263b8769f00b0f865e98b6e

update aconfig storage daemon flag read api

Bug: b/312444587
Test: m and avd
Change-Id: Iae5fd015776b2bdcf37ab601b21f3ae20d9095c5

aconfigd/aconfigd.cpp

diff --git a/aconfigd/aconfigd.cpp b/aconfigd/aconfigd.cpp
index 0d90be2..1037a1d 100644
--- a/aconfigd/aconfigd.cpp
+++ b/aconfigd/aconfigd.cpp
@@ -272,7 +272,7 @@
                      << ": " << mapped_file.error();
     }
 
-    auto offset = aconfig_storage::get_package_offset(*mapped_file, package);
+    auto offset = aconfig_storage::get_package_read_context(*mapped_file, package);
     if (!offset.ok()) {
       return Error() << "Failed to get offset for package " << package
                      << " from package map of " << entry.container() << " :"
@@ -300,18 +300,18 @@
                    << ": " << package_map.error();
   }
 
-  auto pkg_offset = aconfig_storage::get_package_offset(*package_map, package);
-  if (!pkg_offset.ok()) {
+  auto package_context = aconfig_storage::get_package_read_context(*package_map, package);
+  if (!package_context.ok()) {
     return Error() << "Failed to get package offset of " << package
-                   << " in " << container  << " :" << pkg_offset.error();
+                   << " in " << container  << " :" << package_context.error();
   }
 
-  if (!pkg_offset->package_exists) {
+  if (!package_context->package_exists) {
     return Error() << package << " is not found in " << container;
   }
 
-  uint32_t package_id = pkg_offset->package_id;
-  uint32_t package_offset = pkg_offset->boolean_offset;
+  uint32_t package_id = package_context->package_id;
+  uint32_t package_start_index = package_context->boolean_start_index;
 
   auto flag_map = aconfig_storage::get_mapped_file(
       container, aconfig_storage::StorageFileType::flag_map);
@@ -320,18 +320,17 @@
                    << ": " << flag_map.error();
   }
 
-  auto flg_offset = aconfig_storage::get_flag_offset(*flag_map, package_id, flag);
-  if (!flg_offset.ok()) {
+  auto flag_context = aconfig_storage::get_flag_read_context(*flag_map, package_id, flag);
+  if (!flag_context.ok()) {
     return Error() << "Failed to get flag offset of " << flag
-                   << " in " << container  << " :" << flg_offset.error();
+                   << " in " << container  << " :" << flag_context.error();
   }
 
-  if (!flg_offset->flag_exists) {
+  if (!flag_context->flag_exists) {
     return Error() << flag << " is not found in " << container;
   }
 
-  uint16_t flag_offset = flg_offset->flag_id;
-  return package_offset + flag_offset;
+  return package_start_index + flag_context->flag_index;
 }
 
 /// Add a new storage