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/AttributeResolution.cpp

diff --git a/libs/androidfw/AttributeResolution.cpp b/libs/androidfw/AttributeResolution.cpp
index f912af4..57e3491 100644
--- a/libs/androidfw/AttributeResolution.cpp
+++ b/libs/androidfw/AttributeResolution.cpp
@@ -310,7 +310,8 @@
         type_set_flags = style_flags;
         value = entry->value;
         if (kDebugStyles) {
-          ALOGI("-> From style: type=0x%x, data=0x%08x", value.dataType, value.data);
+          ALOGI("-> From style: type=0x%x, data=0x%08x, style=0x%08x", value.dataType, value.data,
+              entry->style);
         }
       }
     }
@@ -388,7 +389,6 @@
       // out_indices must NOT be nullptr.
       out_indices[indices_idx] = ii;
     }
-
     out_values += STYLE_NUM_ENTRIES;
   }