Revert "libandroidfw hardening for IncFs"
Revert "Move map_ptr to incfs namspace"
Revert submission 12787270
Reason for revert: b/173250495
Reverted Changes:
I5cd1bc8a2:libandroidfw hardening for IncFs
Ice5dbcfb2:Move map_ptr to incfs namspace
I29ccdc8ed:Do not cache bag parent stack until requested
I1e9e9acaa:Cache resolved theme values
Change-Id: Ib90ef68339710086df41e9abe0833a542d03a74f
diff --git a/libs/androidfw/tests/AssetManager2_test.cpp b/libs/androidfw/tests/AssetManager2_test.cpp
index 3638ce1..8c255d1 100644
--- a/libs/androidfw/tests/AssetManager2_test.cpp
+++ b/libs/androidfw/tests/AssetManager2_test.cpp
@@ -108,18 +108,24 @@
assetmanager.SetConfiguration(desired_config);
assetmanager.SetApkAssets({basic_assets_.get()});
- auto value = assetmanager.GetResource(basic::R::string::test1);
- ASSERT_TRUE(value.has_value());
+ Res_value value;
+ ResTable_config selected_config;
+ uint32_t flags;
+
+ ApkAssetsCookie cookie =
+ assetmanager.GetResource(basic::R::string::test1, false /*may_be_bag*/,
+ 0 /*density_override*/, &value, &selected_config, &flags);
+ ASSERT_NE(kInvalidCookie, cookie);
// Came from our ApkAssets.
- EXPECT_EQ(0, value->cookie);
+ EXPECT_EQ(0, cookie);
// It is the default config.
- EXPECT_EQ(0, value->config.language[0]);
- EXPECT_EQ(0, value->config.language[1]);
+ EXPECT_EQ(0, selected_config.language[0]);
+ EXPECT_EQ(0, selected_config.language[1]);
// It is a string.
- EXPECT_EQ(Res_value::TYPE_STRING, value->type);
+ EXPECT_EQ(Res_value::TYPE_STRING, value.dataType);
}
TEST_F(AssetManager2Test, FindsResourceFromMultipleApkAssets) {
@@ -132,18 +138,24 @@
assetmanager.SetConfiguration(desired_config);
assetmanager.SetApkAssets({basic_assets_.get(), basic_de_fr_assets_.get()});
- auto value = assetmanager.GetResource(basic::R::string::test1);
- ASSERT_TRUE(value.has_value());
+ Res_value value;
+ ResTable_config selected_config;
+ uint32_t flags;
+
+ ApkAssetsCookie cookie =
+ assetmanager.GetResource(basic::R::string::test1, false /*may_be_bag*/,
+ 0 /*density_override*/, &value, &selected_config, &flags);
+ ASSERT_NE(kInvalidCookie, cookie);
// Came from our de_fr ApkAssets.
- EXPECT_EQ(1, value->cookie);
+ EXPECT_EQ(1, cookie);
// The configuration is German.
- EXPECT_EQ('d', value->config.language[0]);
- EXPECT_EQ('e', value->config.language[1]);
+ EXPECT_EQ('d', selected_config.language[0]);
+ EXPECT_EQ('e', selected_config.language[1]);
// It is a string.
- EXPECT_EQ(Res_value::TYPE_STRING, value->type);
+ EXPECT_EQ(Res_value::TYPE_STRING, value.dataType);
}
TEST_F(AssetManager2Test, FindsResourceFromSharedLibrary) {
@@ -154,35 +166,44 @@
assetmanager.SetApkAssets(
{lib_two_assets_.get(), lib_one_assets_.get(), libclient_assets_.get()});
- auto value = assetmanager.GetResource(libclient::R::string::foo_one);
- ASSERT_TRUE(value.has_value());
+ Res_value value;
+ ResTable_config selected_config;
+ uint32_t flags;
+
+ ApkAssetsCookie cookie =
+ assetmanager.GetResource(libclient::R::string::foo_one, false /*may_be_bag*/,
+ 0 /*density_override*/, &value, &selected_config, &flags);
+ ASSERT_NE(kInvalidCookie, cookie);
// Reference comes from libclient.
- EXPECT_EQ(2, value->cookie);
- EXPECT_EQ(Res_value::TYPE_REFERENCE, value->type);
+ EXPECT_EQ(2, cookie);
+ EXPECT_EQ(Res_value::TYPE_REFERENCE, value.dataType);
// Lookup the reference.
- value = assetmanager.GetResource(value->data);
- ASSERT_TRUE(value.has_value());
- EXPECT_EQ(1, value->cookie);
- EXPECT_EQ(Res_value::TYPE_STRING, value->type);
+ cookie = assetmanager.GetResource(value.data, false /* may_be_bag */, 0 /* density_override*/,
+ &value, &selected_config, &flags);
+ ASSERT_NE(kInvalidCookie, cookie);
+ EXPECT_EQ(1, cookie);
+ EXPECT_EQ(Res_value::TYPE_STRING, value.dataType);
EXPECT_EQ(std::string("Foo from lib_one"),
- GetStringFromPool(assetmanager.GetStringPoolForCookie(value->cookie), value->data));
+ GetStringFromPool(assetmanager.GetStringPoolForCookie(cookie), value.data));
- value = assetmanager.GetResource(libclient::R::string::foo_two);
- ASSERT_TRUE(value.has_value());
+ cookie = assetmanager.GetResource(libclient::R::string::foo_two, false /*may_be_bag*/,
+ 0 /*density_override*/, &value, &selected_config, &flags);
+ ASSERT_NE(kInvalidCookie, cookie);
// Reference comes from libclient.
- EXPECT_EQ(2, value->cookie);
- EXPECT_EQ(Res_value::TYPE_REFERENCE, value->type);
+ EXPECT_EQ(2, cookie);
+ EXPECT_EQ(Res_value::TYPE_REFERENCE, value.dataType);
// Lookup the reference.
- value = assetmanager.GetResource(value->data);
- ASSERT_TRUE(value.has_value());
- EXPECT_EQ(0, value->cookie);
- EXPECT_EQ(Res_value::TYPE_STRING, value->type);
+ cookie = assetmanager.GetResource(value.data, false /* may_be_bag */, 0 /* density_override*/,
+ &value, &selected_config, &flags);
+ ASSERT_NE(kInvalidCookie, cookie);
+ EXPECT_EQ(0, cookie);
+ EXPECT_EQ(Res_value::TYPE_STRING, value.dataType);
EXPECT_EQ(std::string("Foo from lib_two"),
- GetStringFromPool(assetmanager.GetStringPoolForCookie(value->cookie), value->data));
+ GetStringFromPool(assetmanager.GetStringPoolForCookie(cookie), value.data));
}
TEST_F(AssetManager2Test, FindsResourceFromAppLoadedAsSharedLibrary) {
@@ -190,10 +211,16 @@
assetmanager.SetApkAssets({appaslib_assets_.get()});
// The appaslib package will have been assigned the package ID 0x02.
- auto value = assetmanager.GetResource(fix_package_id(appaslib::R::integer::number1, 0x02));
- ASSERT_TRUE(value.has_value());
- EXPECT_EQ(Res_value::TYPE_REFERENCE, value->type);
- EXPECT_EQ(fix_package_id(appaslib::R::array::integerArray1, 0x02), value->data);
+
+ Res_value value;
+ ResTable_config selected_config;
+ uint32_t flags;
+ ApkAssetsCookie cookie = assetmanager.GetResource(
+ fix_package_id(appaslib::R::integer::number1, 0x02), false /*may_be_bag*/,
+ 0u /*density_override*/, &value, &selected_config, &flags);
+ ASSERT_NE(kInvalidCookie, cookie);
+ EXPECT_EQ(Res_value::TYPE_REFERENCE, value.dataType);
+ EXPECT_EQ(fix_package_id(appaslib::R::array::integerArray1, 0x02), value.data);
}
TEST_F(AssetManager2Test, AssignsOverlayPackageIdLast) {
@@ -211,40 +238,40 @@
return assetmanager.GetAssignedPackageId(apkAssets->GetLoadedArsc()->GetPackages()[0].get());
};
- ASSERT_EQ(0x7f, get_first_package_id(overlayable_assets_.get()));
- ASSERT_EQ(0x03, get_first_package_id(overlay_assets_.get()));
- ASSERT_EQ(0x02, get_first_package_id(lib_one_assets_.get()));
+ ASSERT_EQ(get_first_package_id(overlayable_assets_.get()), 0x7f);
+ ASSERT_EQ(get_first_package_id(overlay_assets_.get()), 0x03);
+ ASSERT_EQ(get_first_package_id(lib_one_assets_.get()), 0x02);
}
TEST_F(AssetManager2Test, GetSharedLibraryResourceName) {
AssetManager2 assetmanager;
assetmanager.SetApkAssets({lib_one_assets_.get()});
- auto name = assetmanager.GetResourceName(lib_one::R::string::foo);
- ASSERT_TRUE(name.has_value());
- ASSERT_EQ("com.android.lib_one:string/foo", ToFormattedResourceString(*name));
+ AssetManager2::ResourceName name;
+ ASSERT_TRUE(assetmanager.GetResourceName(lib_one::R::string::foo, &name));
+ std::string formatted_name = ToFormattedResourceString(&name);
+ ASSERT_EQ(formatted_name, "com.android.lib_one:string/foo");
}
TEST_F(AssetManager2Test, FindsBagResourceFromSingleApkAssets) {
AssetManager2 assetmanager;
assetmanager.SetApkAssets({basic_assets_.get()});
- auto bag = assetmanager.GetBag(basic::R::array::integerArray1);
- ASSERT_TRUE(bag.has_value());
+ const ResolvedBag* bag = assetmanager.GetBag(basic::R::array::integerArray1);
+ ASSERT_NE(nullptr, bag);
+ ASSERT_EQ(3u, bag->entry_count);
- ASSERT_EQ(3u, (*bag)->entry_count);
+ EXPECT_EQ(static_cast<uint8_t>(Res_value::TYPE_INT_DEC), bag->entries[0].value.dataType);
+ EXPECT_EQ(1u, bag->entries[0].value.data);
+ EXPECT_EQ(0, bag->entries[0].cookie);
- EXPECT_EQ(static_cast<uint8_t>(Res_value::TYPE_INT_DEC), (*bag)->entries[0].value.dataType);
- EXPECT_EQ(1u, (*bag)->entries[0].value.data);
- EXPECT_EQ(0, (*bag)->entries[0].cookie);
+ EXPECT_EQ(static_cast<uint8_t>(Res_value::TYPE_INT_DEC), bag->entries[1].value.dataType);
+ EXPECT_EQ(2u, bag->entries[1].value.data);
+ EXPECT_EQ(0, bag->entries[1].cookie);
- EXPECT_EQ(static_cast<uint8_t>(Res_value::TYPE_INT_DEC), (*bag)->entries[1].value.dataType);
- EXPECT_EQ(2u, (*bag)->entries[1].value.data);
- EXPECT_EQ(0, (*bag)->entries[1].cookie);
-
- EXPECT_EQ(static_cast<uint8_t>(Res_value::TYPE_INT_DEC), (*bag)->entries[2].value.dataType);
- EXPECT_EQ(3u, (*bag)->entries[2].value.data);
- EXPECT_EQ(0, (*bag)->entries[2].cookie);
+ EXPECT_EQ(static_cast<uint8_t>(Res_value::TYPE_INT_DEC), bag->entries[2].value.dataType);
+ EXPECT_EQ(3u, bag->entries[2].value.data);
+ EXPECT_EQ(0, bag->entries[2].cookie);
}
TEST_F(AssetManager2Test, FindsBagResourceFromMultipleApkAssets) {}
@@ -257,16 +284,15 @@
assetmanager.SetApkAssets(
{lib_two_assets_.get(), lib_one_assets_.get(), libclient_assets_.get()});
- auto bag = assetmanager.GetBag(fix_package_id(lib_one::R::style::Theme, 0x03));
- ASSERT_TRUE(bag.has_value());
-
- ASSERT_GE((*bag)->entry_count, 2u);
+ const ResolvedBag* bag = assetmanager.GetBag(fix_package_id(lib_one::R::style::Theme, 0x03));
+ ASSERT_NE(nullptr, bag);
+ ASSERT_GE(bag->entry_count, 2u);
// First two attributes come from lib_one.
- EXPECT_EQ(1, (*bag)->entries[0].cookie);
- EXPECT_EQ(0x03, get_package_id((*bag)->entries[0].key));
- EXPECT_EQ(1, (*bag)->entries[1].cookie);
- EXPECT_EQ(0x03, get_package_id((*bag)->entries[1].key));
+ EXPECT_EQ(1, bag->entries[0].cookie);
+ EXPECT_EQ(0x03, get_package_id(bag->entries[0].key));
+ EXPECT_EQ(1, bag->entries[1].cookie);
+ EXPECT_EQ(0x03, get_package_id(bag->entries[1].key));
}
TEST_F(AssetManager2Test, FindsBagResourceFromMultipleSharedLibraries) {
@@ -277,17 +303,17 @@
assetmanager.SetApkAssets(
{lib_two_assets_.get(), lib_one_assets_.get(), libclient_assets_.get()});
- auto bag = assetmanager.GetBag(libclient::R::style::ThemeMultiLib);
- ASSERT_TRUE(bag.has_value());
- ASSERT_EQ((*bag)->entry_count, 2u);
+ const ResolvedBag* bag = assetmanager.GetBag(libclient::R::style::ThemeMultiLib);
+ ASSERT_NE(nullptr, bag);
+ ASSERT_EQ(bag->entry_count, 2u);
// First attribute comes from lib_two.
- EXPECT_EQ(2, (*bag)->entries[0].cookie);
- EXPECT_EQ(0x02, get_package_id((*bag)->entries[0].key));
+ EXPECT_EQ(2, bag->entries[0].cookie);
+ EXPECT_EQ(0x02, get_package_id(bag->entries[0].key));
// The next two attributes come from lib_one.
- EXPECT_EQ(2, (*bag)->entries[1].cookie);
- EXPECT_EQ(0x03, get_package_id((*bag)->entries[1].key));
+ EXPECT_EQ(2, bag->entries[1].cookie);
+ EXPECT_EQ(0x03, get_package_id(bag->entries[1].key));
}
TEST_F(AssetManager2Test, FindsStyleResourceWithParentFromSharedLibrary) {
@@ -298,79 +324,79 @@
assetmanager.SetApkAssets(
{lib_two_assets_.get(), lib_one_assets_.get(), libclient_assets_.get()});
- auto bag = assetmanager.GetBag(libclient::R::style::Theme);
- ASSERT_TRUE(bag.has_value());
- ASSERT_GE((*bag)->entry_count, 2u);
+ const ResolvedBag* bag = assetmanager.GetBag(libclient::R::style::Theme);
+ ASSERT_NE(nullptr, bag);
+ ASSERT_GE(bag->entry_count, 2u);
// First two attributes come from lib_one.
- EXPECT_EQ(1, (*bag)->entries[0].cookie);
- EXPECT_EQ(0x03, get_package_id((*bag)->entries[0].key));
- EXPECT_EQ(1, (*bag)->entries[1].cookie);
- EXPECT_EQ(0x03, get_package_id((*bag)->entries[1].key));
+ EXPECT_EQ(1, bag->entries[0].cookie);
+ EXPECT_EQ(0x03, get_package_id(bag->entries[0].key));
+ EXPECT_EQ(1, bag->entries[1].cookie);
+ EXPECT_EQ(0x03, get_package_id(bag->entries[1].key));
}
TEST_F(AssetManager2Test, MergesStylesWithParentFromSingleApkAssets) {
AssetManager2 assetmanager;
assetmanager.SetApkAssets({style_assets_.get()});
- auto bag_one = assetmanager.GetBag(app::R::style::StyleOne);
- ASSERT_TRUE(bag_one.has_value());
- ASSERT_EQ(2u, (*bag_one)->entry_count);
+ const ResolvedBag* bag_one = assetmanager.GetBag(app::R::style::StyleOne);
+ ASSERT_NE(nullptr, bag_one);
+ ASSERT_EQ(2u, bag_one->entry_count);
- EXPECT_EQ(app::R::attr::attr_one, (*bag_one)->entries[0].key);
- EXPECT_EQ(Res_value::TYPE_INT_DEC, (*bag_one)->entries[0].value.dataType);
- EXPECT_EQ(1u, (*bag_one)->entries[0].value.data);
- EXPECT_EQ(0, (*bag_one)->entries[0].cookie);
+ EXPECT_EQ(app::R::attr::attr_one, bag_one->entries[0].key);
+ EXPECT_EQ(Res_value::TYPE_INT_DEC, bag_one->entries[0].value.dataType);
+ EXPECT_EQ(1u, bag_one->entries[0].value.data);
+ EXPECT_EQ(0, bag_one->entries[0].cookie);
- EXPECT_EQ(app::R::attr::attr_two, (*bag_one)->entries[1].key);
- EXPECT_EQ(Res_value::TYPE_INT_DEC, (*bag_one)->entries[1].value.dataType);
- EXPECT_EQ(2u, (*bag_one)->entries[1].value.data);
- EXPECT_EQ(0, (*bag_one)->entries[1].cookie);
+ EXPECT_EQ(app::R::attr::attr_two, bag_one->entries[1].key);
+ EXPECT_EQ(Res_value::TYPE_INT_DEC, bag_one->entries[1].value.dataType);
+ EXPECT_EQ(2u, bag_one->entries[1].value.data);
+ EXPECT_EQ(0, bag_one->entries[1].cookie);
- auto bag_two = assetmanager.GetBag(app::R::style::StyleTwo);
- ASSERT_TRUE(bag_two.has_value());
- ASSERT_EQ(6u, (*bag_two)->entry_count);
+ const ResolvedBag* bag_two = assetmanager.GetBag(app::R::style::StyleTwo);
+ ASSERT_NE(nullptr, bag_two);
+ ASSERT_EQ(6u, bag_two->entry_count);
// attr_one is inherited from StyleOne.
- EXPECT_EQ(app::R::attr::attr_one, (*bag_two)->entries[0].key);
- EXPECT_EQ(Res_value::TYPE_INT_DEC, (*bag_two)->entries[0].value.dataType);
- EXPECT_EQ(1u, (*bag_two)->entries[0].value.data);
- EXPECT_EQ(0, (*bag_two)->entries[0].cookie);
- EXPECT_EQ(app::R::style::StyleOne, (*bag_two)->entries[0].style);
+ EXPECT_EQ(app::R::attr::attr_one, bag_two->entries[0].key);
+ EXPECT_EQ(Res_value::TYPE_INT_DEC, bag_two->entries[0].value.dataType);
+ EXPECT_EQ(1u, bag_two->entries[0].value.data);
+ EXPECT_EQ(0, bag_two->entries[0].cookie);
+ EXPECT_EQ(app::R::style::StyleOne, bag_two->entries[0].style);
// attr_two should be overridden from StyleOne by StyleTwo.
- EXPECT_EQ(app::R::attr::attr_two, (*bag_two)->entries[1].key);
- EXPECT_EQ(Res_value::TYPE_STRING, (*bag_two)->entries[1].value.dataType);
- EXPECT_EQ(0, (*bag_two)->entries[1].cookie);
- EXPECT_EQ(app::R::style::StyleTwo, (*bag_two)->entries[1].style);
+ EXPECT_EQ(app::R::attr::attr_two, bag_two->entries[1].key);
+ EXPECT_EQ(Res_value::TYPE_STRING, bag_two->entries[1].value.dataType);
+ EXPECT_EQ(0, bag_two->entries[1].cookie);
+ EXPECT_EQ(app::R::style::StyleTwo, bag_two->entries[1].style);
EXPECT_EQ(std::string("string"), GetStringFromPool(assetmanager.GetStringPoolForCookie(0),
- (*bag_two)->entries[1].value.data));
+ bag_two->entries[1].value.data));
// The rest are new attributes.
- EXPECT_EQ(app::R::attr::attr_three, (*bag_two)->entries[2].key);
- EXPECT_EQ(Res_value::TYPE_ATTRIBUTE, (*bag_two)->entries[2].value.dataType);
- EXPECT_EQ(app::R::attr::attr_indirect, (*bag_two)->entries[2].value.data);
- EXPECT_EQ(0, (*bag_two)->entries[2].cookie);
- EXPECT_EQ(app::R::style::StyleTwo, (*bag_two)->entries[2].style);
+ EXPECT_EQ(app::R::attr::attr_three, bag_two->entries[2].key);
+ EXPECT_EQ(Res_value::TYPE_ATTRIBUTE, bag_two->entries[2].value.dataType);
+ EXPECT_EQ(app::R::attr::attr_indirect, bag_two->entries[2].value.data);
+ EXPECT_EQ(0, bag_two->entries[2].cookie);
+ EXPECT_EQ(app::R::style::StyleTwo, bag_two->entries[2].style);
- EXPECT_EQ(app::R::attr::attr_five, (*bag_two)->entries[3].key);
- EXPECT_EQ(Res_value::TYPE_REFERENCE, (*bag_two)->entries[3].value.dataType);
- EXPECT_EQ(app::R::string::string_one, (*bag_two)->entries[3].value.data);
- EXPECT_EQ(0, (*bag_two)->entries[3].cookie);
- EXPECT_EQ(app::R::style::StyleTwo, (*bag_two)->entries[3].style);
+ EXPECT_EQ(app::R::attr::attr_five, bag_two->entries[3].key);
+ EXPECT_EQ(Res_value::TYPE_REFERENCE, bag_two->entries[3].value.dataType);
+ EXPECT_EQ(app::R::string::string_one, bag_two->entries[3].value.data);
+ EXPECT_EQ(0, bag_two->entries[3].cookie);
+ EXPECT_EQ(app::R::style::StyleTwo, bag_two->entries[3].style);
- EXPECT_EQ(app::R::attr::attr_indirect, (*bag_two)->entries[4].key);
- EXPECT_EQ(Res_value::TYPE_INT_DEC, (*bag_two)->entries[4].value.dataType);
- EXPECT_EQ(3u, (*bag_two)->entries[4].value.data);
- EXPECT_EQ(0, (*bag_two)->entries[4].cookie);
- EXPECT_EQ(app::R::style::StyleTwo, (*bag_two)->entries[4].style);
+ EXPECT_EQ(app::R::attr::attr_indirect, bag_two->entries[4].key);
+ EXPECT_EQ(Res_value::TYPE_INT_DEC, bag_two->entries[4].value.dataType);
+ EXPECT_EQ(3u, bag_two->entries[4].value.data);
+ EXPECT_EQ(0, bag_two->entries[4].cookie);
+ EXPECT_EQ(app::R::style::StyleTwo, bag_two->entries[4].style);
- EXPECT_EQ(app::R::attr::attr_empty, (*bag_two)->entries[5].key);
- EXPECT_EQ(Res_value::TYPE_NULL, (*bag_two)->entries[5].value.dataType);
- EXPECT_EQ(Res_value::DATA_NULL_EMPTY, (*bag_two)->entries[5].value.data);
- EXPECT_EQ(0, (*bag_two)->entries[5].cookie);
- EXPECT_EQ(app::R::style::StyleTwo, (*bag_two)->entries[5].style);
+ EXPECT_EQ(app::R::attr::attr_empty, bag_two->entries[5].key);
+ EXPECT_EQ(Res_value::TYPE_NULL, bag_two->entries[5].value.dataType);
+ EXPECT_EQ(Res_value::DATA_NULL_EMPTY, bag_two->entries[5].value.data);
+ EXPECT_EQ(0, bag_two->entries[5].cookie);
+ EXPECT_EQ(app::R::style::StyleTwo, bag_two->entries[5].style);
}
TEST_F(AssetManager2Test, MergeStylesCircularDependency) {
@@ -379,41 +405,55 @@
// GetBag should stop traversing the parents of styles when a circular
// dependency is detected
- auto bag = assetmanager.GetBag(app::R::style::StyleFour);
- ASSERT_TRUE(bag.has_value());
- ASSERT_EQ(3u, (*bag)->entry_count);
+ const ResolvedBag* bag_one = assetmanager.GetBag(app::R::style::StyleFour);
+ ASSERT_NE(nullptr, bag_one);
+ ASSERT_EQ(3u, bag_one->entry_count);
}
TEST_F(AssetManager2Test, ResolveReferenceToResource) {
AssetManager2 assetmanager;
assetmanager.SetApkAssets({basic_assets_.get()});
- auto value = assetmanager.GetResource(basic::R::integer::ref1);
- ASSERT_TRUE(value.has_value());
- EXPECT_EQ(Res_value::TYPE_REFERENCE, value->type);
- EXPECT_EQ(basic::R::integer::ref2, value->data);
+ Res_value value;
+ ResTable_config selected_config;
+ uint32_t flags;
+ ApkAssetsCookie cookie =
+ assetmanager.GetResource(basic::R::integer::ref1, false /*may_be_bag*/,
+ 0u /*density_override*/, &value, &selected_config, &flags);
+ ASSERT_NE(kInvalidCookie, cookie);
- auto result = assetmanager.ResolveReference(*value);
- ASSERT_TRUE(result.has_value());
- EXPECT_EQ(Res_value::TYPE_INT_DEC, value->type);
- EXPECT_EQ(12000u, value->data);
- EXPECT_EQ(basic::R::integer::ref2, value->resid);
+ EXPECT_EQ(Res_value::TYPE_REFERENCE, value.dataType);
+ EXPECT_EQ(basic::R::integer::ref2, value.data);
+
+ uint32_t last_ref = 0u;
+ cookie = assetmanager.ResolveReference(cookie, &value, &selected_config, &flags, &last_ref);
+ ASSERT_NE(kInvalidCookie, cookie);
+ EXPECT_EQ(Res_value::TYPE_INT_DEC, value.dataType);
+ EXPECT_EQ(12000u, value.data);
+ EXPECT_EQ(basic::R::integer::ref2, last_ref);
}
TEST_F(AssetManager2Test, ResolveReferenceToBag) {
AssetManager2 assetmanager;
assetmanager.SetApkAssets({basic_assets_.get()});
- auto value = assetmanager.GetResource(basic::R::integer::number2, true /*may_be_bag*/);
- ASSERT_TRUE(value.has_value());
- EXPECT_EQ(Res_value::TYPE_REFERENCE, value->type);
- EXPECT_EQ(basic::R::array::integerArray1, value->data);
+ Res_value value;
+ ResTable_config selected_config;
+ uint32_t flags;
+ ApkAssetsCookie cookie =
+ assetmanager.GetResource(basic::R::integer::number2, true /*may_be_bag*/,
+ 0u /*density_override*/, &value, &selected_config, &flags);
+ ASSERT_NE(kInvalidCookie, cookie);
- auto result = assetmanager.ResolveReference(*value);
- ASSERT_TRUE(result.has_value());
- EXPECT_EQ(Res_value::TYPE_REFERENCE, value->type);
- EXPECT_EQ(basic::R::array::integerArray1, value->data);
- EXPECT_EQ(basic::R::array::integerArray1, value->resid);
+ EXPECT_EQ(Res_value::TYPE_REFERENCE, value.dataType);
+ EXPECT_EQ(basic::R::array::integerArray1, value.data);
+
+ uint32_t last_ref = 0u;
+ cookie = assetmanager.ResolveReference(cookie, &value, &selected_config, &flags, &last_ref);
+ ASSERT_NE(kInvalidCookie, cookie);
+ EXPECT_EQ(Res_value::TYPE_REFERENCE, value.dataType);
+ EXPECT_EQ(basic::R::array::integerArray1, value.data);
+ EXPECT_EQ(basic::R::array::integerArray1, last_ref);
}
TEST_F(AssetManager2Test, ResolveDeepIdReference) {
@@ -421,25 +461,31 @@
assetmanager.SetApkAssets({basic_assets_.get()});
// Set up the resource ids
- auto high_ref = assetmanager.GetResourceId("@id/high_ref", "values", "com.android.basic");
- ASSERT_TRUE(high_ref.has_value());
-
- auto middle_ref = assetmanager.GetResourceId("@id/middle_ref", "values", "com.android.basic");
- ASSERT_TRUE(middle_ref.has_value());
-
- auto low_ref = assetmanager.GetResourceId("@id/low_ref", "values", "com.android.basic");
- ASSERT_TRUE(low_ref.has_value());
+ const uint32_t high_ref = assetmanager
+ .GetResourceId("@id/high_ref", "values", "com.android.basic");
+ ASSERT_NE(high_ref, 0u);
+ const uint32_t middle_ref = assetmanager
+ .GetResourceId("@id/middle_ref", "values", "com.android.basic");
+ ASSERT_NE(middle_ref, 0u);
+ const uint32_t low_ref = assetmanager
+ .GetResourceId("@id/low_ref", "values", "com.android.basic");
+ ASSERT_NE(low_ref, 0u);
// Retrieve the most shallow resource
- auto value = assetmanager.GetResource(*high_ref);
- ASSERT_TRUE(value.has_value());
- EXPECT_EQ(Res_value::TYPE_REFERENCE, value->type);
- EXPECT_EQ(*middle_ref, value->data);;
+ Res_value value;
+ ResTable_config config;
+ uint32_t flags;
+ ApkAssetsCookie cookie = assetmanager.GetResource(high_ref, false /*may_be_bag*/,
+ 0 /*density_override*/,
+ &value, &config, &flags);
+ ASSERT_NE(kInvalidCookie, cookie);
+ EXPECT_EQ(Res_value::TYPE_REFERENCE, value.dataType);
+ EXPECT_EQ(middle_ref, value.data);
// Check that resolving the reference resolves to the deepest id
- auto result = assetmanager.ResolveReference(*value);
- ASSERT_TRUE(result.has_value());
- EXPECT_EQ(*low_ref, value->resid);
+ uint32_t last_ref = high_ref;
+ assetmanager.ResolveReference(cookie, &value, &config, &flags, &last_ref);
+ EXPECT_EQ(last_ref, low_ref);
}
TEST_F(AssetManager2Test, KeepLastReferenceIdUnmodifiedIfNoReferenceIsResolved) {
@@ -449,16 +495,16 @@
ResTable_config selected_config;
memset(&selected_config, 0, sizeof(selected_config));
- // Create some kind of value that is NOT a reference.
- AssetManager2::SelectedValue value{};
- value.cookie = 1;
- value.type = Res_value::TYPE_STRING;
- value.resid = basic::R::string::test1;
+ uint32_t flags = 0u;
- auto result = assetmanager.ResolveReference(value);
- ASSERT_TRUE(result.has_value());
- EXPECT_EQ(1, value.cookie);
- EXPECT_EQ(basic::R::string::test1, value.resid);
+ // Create some kind of Res_value that is NOT a reference.
+ Res_value value;
+ value.dataType = Res_value::TYPE_STRING;
+ value.data = 0;
+
+ uint32_t last_ref = basic::R::string::test1;
+ EXPECT_EQ(1, assetmanager.ResolveReference(1, &value, &selected_config, &flags, &last_ref));
+ EXPECT_EQ(basic::R::string::test1, last_ref);
}
static bool IsConfigurationPresent(const std::set<ResTable_config>& configurations,
@@ -470,45 +516,43 @@
AssetManager2 assetmanager;
assetmanager.SetApkAssets({system_assets_.get(), basic_de_fr_assets_.get()});
- auto configurations = assetmanager.GetResourceConfigurations();
- ASSERT_TRUE(configurations.has_value());
+ std::set<ResTable_config> configurations = assetmanager.GetResourceConfigurations();
// We expect the locale sv from the system assets, and de and fr from basic_de_fr assets.
// And one extra for the default configuration.
- EXPECT_EQ(4u, configurations->size());
+ EXPECT_EQ(4u, configurations.size());
ResTable_config expected_config;
memset(&expected_config, 0, sizeof(expected_config));
expected_config.language[0] = 's';
expected_config.language[1] = 'v';
- EXPECT_TRUE(IsConfigurationPresent(*configurations, expected_config));
+ EXPECT_TRUE(IsConfigurationPresent(configurations, expected_config));
expected_config.language[0] = 'd';
expected_config.language[1] = 'e';
- EXPECT_TRUE(IsConfigurationPresent(*configurations, expected_config));
+ EXPECT_TRUE(IsConfigurationPresent(configurations, expected_config));
expected_config.language[0] = 'f';
expected_config.language[1] = 'r';
- EXPECT_TRUE(IsConfigurationPresent(*configurations, expected_config));
+ EXPECT_TRUE(IsConfigurationPresent(configurations, expected_config));
// Take out the system assets.
configurations = assetmanager.GetResourceConfigurations(true /* exclude_system */);
- ASSERT_TRUE(configurations.has_value());
// We expect de and fr from basic_de_fr assets.
- EXPECT_EQ(2u, configurations->size());
+ EXPECT_EQ(2u, configurations.size());
expected_config.language[0] = 's';
expected_config.language[1] = 'v';
- EXPECT_FALSE(IsConfigurationPresent(*configurations, expected_config));
+ EXPECT_FALSE(IsConfigurationPresent(configurations, expected_config));
expected_config.language[0] = 'd';
expected_config.language[1] = 'e';
- EXPECT_TRUE(IsConfigurationPresent(*configurations, expected_config));
+ EXPECT_TRUE(IsConfigurationPresent(configurations, expected_config));
expected_config.language[0] = 'f';
expected_config.language[1] = 'r';
- EXPECT_TRUE(IsConfigurationPresent(*configurations, expected_config));
+ EXPECT_TRUE(IsConfigurationPresent(configurations, expected_config));
}
TEST_F(AssetManager2Test, GetResourceLocales) {
@@ -534,17 +578,12 @@
AssetManager2 assetmanager;
assetmanager.SetApkAssets({basic_assets_.get()});
- auto resid = assetmanager.GetResourceId("com.android.basic:layout/main", "", "");
- ASSERT_TRUE(resid.has_value());
- EXPECT_EQ(basic::R::layout::main, *resid);
-
- resid = assetmanager.GetResourceId("layout/main", "", "com.android.basic");
- ASSERT_TRUE(resid.has_value());
- EXPECT_EQ(basic::R::layout::main, *resid);
-
- resid = assetmanager.GetResourceId("main", "layout", "com.android.basic");
- ASSERT_TRUE(resid.has_value());
- EXPECT_EQ(basic::R::layout::main, *resid);
+ EXPECT_EQ(basic::R::layout::main,
+ assetmanager.GetResourceId("com.android.basic:layout/main", "", ""));
+ EXPECT_EQ(basic::R::layout::main,
+ assetmanager.GetResourceId("layout/main", "", "com.android.basic"));
+ EXPECT_EQ(basic::R::layout::main,
+ assetmanager.GetResourceId("main", "layout", "com.android.basic"));
}
TEST_F(AssetManager2Test, OpensFileFromSingleApkAssets) {
@@ -619,8 +658,14 @@
assetmanager.SetApkAssets({basic_assets_.get()});
assetmanager.SetResourceResolutionLoggingEnabled(false);
- auto value = assetmanager.GetResource(basic::R::string::test1);
- ASSERT_TRUE(value.has_value());
+ Res_value value;
+ ResTable_config selected_config;
+ uint32_t flags;
+
+ ApkAssetsCookie cookie =
+ assetmanager.GetResource(basic::R::string::test1, false /*may_be_bag*/,
+ 0 /*density_override*/, &value, &selected_config, &flags);
+ ASSERT_NE(kInvalidCookie, cookie);
auto result = assetmanager.GetLastResourceResolution();
EXPECT_EQ("", result);
@@ -648,12 +693,17 @@
assetmanager.SetConfiguration(desired_config);
assetmanager.SetApkAssets({basic_assets_.get()});
- auto value = assetmanager.GetResource(basic::R::string::test1);
- ASSERT_TRUE(value.has_value());
+ Res_value value;
+ ResTable_config selected_config;
+ uint32_t flags;
+
+ ApkAssetsCookie cookie =
+ assetmanager.GetResource(basic::R::string::test1, false /*may_be_bag*/,
+ 0 /*density_override*/, &value, &selected_config, &flags);
+ ASSERT_NE(kInvalidCookie, cookie);
auto result = assetmanager.GetLastResourceResolution();
- EXPECT_EQ("Resolution for 0x7f030000 com.android.basic:string/test1\n"
- "\tFor config -de\n\tFound initial: com.android.basic", result);
+ EXPECT_EQ("Resolution for 0x7f030000 com.android.basic:string/test1\n\tFor config -de\n\tFound initial: com.android.basic", result);
}
TEST_F(AssetManager2Test, GetLastPathWithMultipleApkAssets) {
@@ -667,14 +717,17 @@
assetmanager.SetConfiguration(desired_config);
assetmanager.SetApkAssets({basic_assets_.get(), basic_de_fr_assets_.get()});
- auto value = assetmanager.GetResource(basic::R::string::test1);
- ASSERT_TRUE(value.has_value());
+ Res_value value = Res_value();
+ ResTable_config selected_config;
+ uint32_t flags;
+
+ ApkAssetsCookie cookie =
+ assetmanager.GetResource(basic::R::string::test1, false /*may_be_bag*/,
+ 0 /*density_override*/, &value, &selected_config, &flags);
+ ASSERT_NE(kInvalidCookie, cookie);
auto result = assetmanager.GetLastResourceResolution();
- EXPECT_EQ("Resolution for 0x7f030000 com.android.basic:string/test1\n"
- "\tFor config -de\n"
- "\tFound initial: com.android.basic\n"
- "\tFound better: com.android.basic -de", result);
+ EXPECT_EQ("Resolution for 0x7f030000 com.android.basic:string/test1\n\tFor config -de\n\tFound initial: com.android.basic\n\tFound better: com.android.basic -de", result);
}
TEST_F(AssetManager2Test, GetLastPathAfterDisablingReturnsEmpty) {
@@ -686,8 +739,14 @@
assetmanager.SetConfiguration(desired_config);
assetmanager.SetApkAssets({basic_assets_.get()});
- auto value = assetmanager.GetResource(basic::R::string::test1);
- ASSERT_TRUE(value.has_value());
+ Res_value value = Res_value();
+ ResTable_config selected_config;
+ uint32_t flags;
+
+ ApkAssetsCookie cookie =
+ assetmanager.GetResource(basic::R::string::test1, false /*may_be_bag*/,
+ 0 /*density_override*/, &value, &selected_config, &flags);
+ ASSERT_NE(kInvalidCookie, cookie);
auto resultEnabled = assetmanager.GetLastResourceResolution();
ASSERT_NE("", resultEnabled);