commit d42a670ee59618e98078079b554f2652035eb1e2
author Aurimas Liutikas <aurimas@google.com> Thu Nov 15 15:48:28 2018 -0800
committer Aurimas Liutikas <aurimas@google.com> Fri Nov 16 10:50:34 2018 -0800
tree 831f5ac01b3f9386ca6a61e2f1e16479ad229afd
parent 10113a7c36838cb7da6b36e7f4800d6cfae6178d

Add style value to ResolvedBag in AssetManager2.

Bug: 117176857
Test: updated AssetManager2Test.MergesStylesWithParentFromSingleApkAssets
Change-Id: I2b79eea8e43431a932756b267b91eb4423c968a5

libs/androidfw/tests/AssetManager2_test.cpp

diff --git a/libs/androidfw/tests/AssetManager2_test.cpp b/libs/androidfw/tests/AssetManager2_test.cpp
index f1cc569..5449a54 100644
--- a/libs/androidfw/tests/AssetManager2_test.cpp
+++ b/libs/androidfw/tests/AssetManager2_test.cpp
@@ -298,11 +298,13 @@
   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(std::string("string"), GetStringFromPool(assetmanager.GetStringPoolForCookie(0),
                                                      bag_two->entries[1].value.data));
 
@@ -312,21 +314,25 @@
   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_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);
 }
 
 TEST_F(AssetManager2Test, MergeStylesCircularDependency) {