From eb759ec58d1617699afa76f42a0965b41bab0bb2 Mon Sep 17 00:00:00 2001 From: "ESWAR MAGATAPALLI (xWF)" Date: Wed, 8 Jan 2025 05:57:41 -0800 Subject: Revert "[res] Don't create extra asset provider when not needed" Revert submission 31021037 Reason for revert: Droidmonitor created revert due to b/388342212. Will be verifying through ABTD before submission. Reverted changes: /q/submissionid:31021037 Change-Id: Ic1964e2db736cfa3db3835a52c00cc81acda0bde --- libs/androidfw/include/androidfw/AssetsProvider.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs/androidfw/include') diff --git a/libs/androidfw/include/androidfw/AssetsProvider.h b/libs/androidfw/include/androidfw/AssetsProvider.h index e3b3ae41f7f4..46d7a57ab763 100644 --- a/libs/androidfw/include/androidfw/AssetsProvider.h +++ b/libs/androidfw/include/androidfw/AssetsProvider.h @@ -164,7 +164,7 @@ struct DirectoryAssetsProvider : public AssetsProvider { // `secondary` asset provider if the asset cannot be found in the `primary`. struct MultiAssetsProvider : public AssetsProvider { static std::unique_ptr Create(std::unique_ptr&& primary, - std::unique_ptr&& secondary = {}); + std::unique_ptr&& secondary); bool ForEachFile(const std::string& root_path, base::function_ref f) const override; -- cgit v1.2.3-59-g8ed1b