diff options
| author | 2015-05-13 21:42:57 +0000 | |
|---|---|---|
| committer | 2015-05-13 21:43:00 +0000 | |
| commit | 4ee67bc7a7bb84da1c92dc08427f9737ff8252d6 (patch) | |
| tree | 1cde9191650b0264f6f4e831a563bcadbecc848c /tools/aapt2/BinaryResourceParser.cpp | |
| parent | ae8fcaf4c320dbf68db7dc032269692806150d99 (diff) | |
| parent | dfa5e0705ff82f15e228ba076bc192893bcbe118 (diff) | |
Merge "AAPT2: Fix issue where @null was wrongly encoded" into mnc-dev
Diffstat (limited to 'tools/aapt2/BinaryResourceParser.cpp')
| -rw-r--r-- | tools/aapt2/BinaryResourceParser.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/aapt2/BinaryResourceParser.cpp b/tools/aapt2/BinaryResourceParser.cpp index 620f0fef33a6..3559f435329b 100644 --- a/tools/aapt2/BinaryResourceParser.cpp +++ b/tools/aapt2/BinaryResourceParser.cpp @@ -697,8 +697,7 @@ std::unique_ptr<Item> BinaryResourceParser::parseValue(const ResourceNameRef& na // This is not an unresolved symbol, so it must be the magic @null reference. Res_value nullType = {}; - nullType.dataType = Res_value::TYPE_NULL; - nullType.data = Res_value::DATA_NULL_UNDEFINED; + nullType.dataType = Res_value::TYPE_REFERENCE; return util::make_unique<BinaryPrimitive>(nullType); } |