summaryrefslogtreecommitdiffstats
path: root/libs/androidfw
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2014-08-29 19:14:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-29 19:14:01 +0000
commit1be18d56a1a74c8ef7882ad4cc04aa3a98736289 (patch)
tree5e4a806470ad399a29f7a535da474355969d4300 /libs/androidfw
parent44e21a21b013ea34e4347945b949cc4f8f47f8ac (diff)
parent343cabb3164db138afbaaae5b145c0ff6a10814a (diff)
downloadframeworks_base-1be18d56a1a74c8ef7882ad4cc04aa3a98736289.zip
frameworks_base-1be18d56a1a74c8ef7882ad4cc04aa3a98736289.tar.gz
frameworks_base-1be18d56a1a74c8ef7882ad4cc04aa3a98736289.tar.bz2
am 9e186ec3: am 60f193fb: am e0cfbb61: Merge "Stamp platform version code into app Apks" into lmp-dev
* commit '9e186ec3a0e87e612786b827c04b6c6e1b507196': Stamp platform version code into app Apks
Diffstat (limited to 'libs/androidfw')
-rw-r--r--libs/androidfw/ResourceTypes.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp
index e944ae3..2c632f8 100644
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@@ -3728,7 +3728,7 @@ ssize_t ResTable::resolveReference(Res_value* value, ssize_t blockIndex,
const char16_t* ResTable::valueToString(
const Res_value* value, size_t stringBlock,
- char16_t /*tmpBuffer*/ [TMP_BUFFER_SIZE], size_t* outLen)
+ char16_t /*tmpBuffer*/ [TMP_BUFFER_SIZE], size_t* outLen) const
{
if (!value) {
return NULL;