am 2ffa4aab: Merge "Use char16_t for char things."

* commit '2ffa4aabd76353a907ee89a3e0c6f1961237f257':
  Use char16_t for char things.

1 files changed, 3 insertions, 3 deletions

diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index f7de5581527b..4dc9bfc31c8f 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -253,7 +253,7 @@ String8 getAttribute(const ResXMLTree& tree, const char* ns,
         }
     }
     size_t len;
-    const uint16_t* str = tree.getAttributeStringValue(idx, &len);
+    const char16_t* str = tree.getAttributeStringValue(idx, &len);
     return str ? String8(str, len) : String8();
 }
 
@@ -271,7 +271,7 @@ static String8 getAttribute(const ResXMLTree& tree, uint32_t attrRes, String8* o
         }
     }
     size_t len;
-    const uint16_t* str = tree.getAttributeStringValue(idx, &len);
+    const char16_t* str = tree.getAttributeStringValue(idx, &len);
     return str ? String8(str, len) : String8();
 }
 
@@ -325,7 +325,7 @@ static String8 getResolvedAttribute(const ResTable* resTable, const ResXMLTree&
     if (tree.getAttributeValue(idx, &value) != NO_ERROR) {
         if (value.dataType == Res_value::TYPE_STRING) {
             size_t len;
-            const uint16_t* str = tree.getAttributeStringValue(idx, &len);
+            const char16_t* str = tree.getAttributeStringValue(idx, &len);
             return str ? String8(str, len) : String8();
         }
         resTable->resolveReference(&value, 0);