diff options
| author | Chih-hung Hsieh <chh@google.com> | 2016-08-12 18:05:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-08-12 18:05:32 +0000 |
| commit | 17bd236b4b6b78c32a187649aa4abcf94e5951c3 (patch) | |
| tree | 3776aabd2d84938c13edf1644cbdb7044d5bbd65 /tools/aapt/Command.cpp | |
| parent | 76ce8e52422bc6121fb974ef6aab040bb5d9da51 (diff) | |
| parent | 8bd37ba458633ee7b2aeec0a7593817000aa84b2 (diff) | |
Merge "Fix clang-tidy warnings in aapt and aapt2."
Diffstat (limited to 'tools/aapt/Command.cpp')
| -rw-r--r-- | tools/aapt/Command.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index ba4aac6f32a8..8eeb84bbdd36 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -248,7 +248,7 @@ bail: } static void printResolvedResourceAttribute(const ResTable& resTable, const ResXMLTree& tree, - uint32_t attrRes, String8 attrLabel, String8* outError) + uint32_t attrRes, const String8& attrLabel, String8* outError) { Res_value value; AaptXml::getResolvedResourceAttribute(resTable, tree, attrRes, &value, outError); @@ -399,7 +399,7 @@ static void printUsesImpliedPermission(const String8& name, const String8& reaso ResTable::normalizeForOutput(reason.string()).string()); } -Vector<String8> getNfcAidCategories(AssetManager& assets, String8 xmlPath, bool offHost, +Vector<String8> getNfcAidCategories(AssetManager& assets, const String8& xmlPath, bool offHost, String8 *outError = NULL) { Asset* aidAsset = assets.openNonAsset(xmlPath, Asset::ACCESS_BUFFER); |