commit 06d3e8fec7e2b29f99d755bee849023d88957953
author Adam Lesinski <adamlesinski@google.com> Thu Jan 05 17:03:55 2017 -0800
committer Adam Lesinski <adamlesinski@google.com> Fri Jan 06 16:51:48 2017 -0800
tree 328055c7a9632e9660e836d4dfd0cfcc0450700e
parent 0a454c39cb5bc03cd646546aa3b8baaed1962178

libandroidfw: Revert null check in ApplyStyle

The out parameter `out_indices` is expected to be non-null
and so the extra null check adds a cost to performance
and opens the door to misusing the API by not supplying
`out_indices`.

Test: make libandroidfw_tests
Change-Id: Ie66fd837c5e24ec2838156e7b67f54c15cd27933

libs/androidfw/AttributeResolution.cpp

diff --git a/libs/androidfw/AttributeResolution.cpp b/libs/androidfw/AttributeResolution.cpp
index f5aef05..d433b90 100644
--- a/libs/androidfw/AttributeResolution.cpp
+++ b/libs/androidfw/AttributeResolution.cpp
@@ -418,8 +418,10 @@
     out_values[STYLE_CHANGING_CONFIGURATIONS] = type_set_flags;
     out_values[STYLE_DENSITY] = config.density;
 
-    if (out_indices != nullptr && value.dataType != Res_value::TYPE_NULL) {
+    if (value.dataType != Res_value::TYPE_NULL) {
       indices_idx++;
+
+      // out_indices must NOT be nullptr.
       out_indices[indices_idx] = ii;
     }
 
@@ -428,9 +430,8 @@
 
   res.unlock();
 
-  if (out_indices != nullptr) {
-    out_indices[0] = indices_idx;
-  }
+  // out_indices must NOT be nullptr.
+  out_indices[0] = indices_idx;
 }
 
 bool RetrieveAttributes(const ResTable* res, ResXMLParser* xml_parser,