Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp

Browse Source 
Change-Id: I5a25f2bac44ac5efcd7462af91005e09680a1d96
This commit is contained in:
Dan Albert
2014-09-08 22:25:54 -07:00
parent ddb605d4b2 6c585756b4
commit 20ec4fa229
7 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/aapt/StringPool.cpp
View File

@@ -21,7 +21,7 @@
#define NOISY(x) //x
void strcpy16_htod(uint16_t* dst, const uint16_t* src)
void strcpy16_htod(char16_t* dst, const char16_t* src)
{
while (*src) {
char16_t s = htods(*src);
@@ -455,9 +455,9 @@ status_t StringPool::writeStringBlock(const sp<AaptFile>& pool)
strncpy((char*)strings, encStr, encSize+1);
} else {
uint16_t* strings = (uint16_t*)dat;
char16_t* strings = (char16_t*)dat;
ENCODE_LENGTH(strings, sizeof(uint16_t), strSize)
ENCODE_LENGTH(strings, sizeof(char16_t), strSize)
strcpy16_htod(strings, ent.value);
}