Use binder-based iterator to retrieve FRROs
If for some reason there are a lot of fabricated overlays in the
resources cache, the binder limit of the list of fabricated overlay
infos could exceed the maximum binder transaction size. Rather than
return all of the frro infos in one transactions, register an iterator
with the native idmap2d service and use multiple binder transactions
to iterate through all of the frros.
Bug: 192948522
Test: Toggle device theme colors several times and observe frro cache
Reboot device and observe old frros are deleted
Change-Id: I5e9cf3ae9d1d45eda683c24141a0cd4e4301e02f
diff --git a/cmds/idmap2/idmap2d/Idmap2Service.h b/cmds/idmap2/idmap2d/Idmap2Service.h
index c16c3c5..c61e4bc 100644
--- a/cmds/idmap2/idmap2d/Idmap2Service.h
+++ b/cmds/idmap2/idmap2d/Idmap2Service.h
@@ -24,6 +24,7 @@
#include <idmap2/ResourceContainer.h>
#include <idmap2/Result.h>
+#include <filesystem>
#include <memory>
#include <string>
#include <vector>
@@ -59,7 +60,11 @@
binder::Status deleteFabricatedOverlay(const std::string& overlay_path,
bool* _aidl_return) override;
- binder::Status getFabricatedOverlayInfos(
+ binder::Status acquireFabricatedOverlayIterator() override;
+
+ binder::Status releaseFabricatedOverlayIterator() override;
+
+ binder::Status nextFabricatedOverlayInfos(
std::vector<os::FabricatedOverlayInfo>* _aidl_return) override;
binder::Status dumpIdmap(const std::string& overlay_path, std::string* _aidl_return) override;
@@ -69,7 +74,7 @@
// be able to be recalculated if idmap2 dies and restarts.
std::unique_ptr<idmap2::TargetResourceContainer> framework_apk_cache_;
- std::vector<os::FabricatedOverlayInfo> fabricated_overlays_;
+ std::optional<std::filesystem::directory_iterator> frro_iter_;
template <typename T>
using MaybeUniquePtr = std::variant<std::unique_ptr<T>, T*>;