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

Merge change I88721afe into eclair-mr2

Browse Source 
* changes:
  Fix bitmask in aapt's StringPool length construction
This commit is contained in:
Android (Google) Code Review
2009-12-04 15:59:59 -08:00
parent 30d9052350 88721afe2f
commit fc32a062f8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aapt/StringPool.cpp
View File

@@ -228,7 +228,7 @@ status_t StringPool::writeStringBlock(const sp<AaptFile>& pool)
} }
dat += (preSize+strPos)/sizeof(uint16_t); dat += (preSize+strPos)/sizeof(uint16_t);
if (lenSize > sizeof(uint16_t)) { if (lenSize > sizeof(uint16_t)) {
*dat = htods(0x8000 | ((strSize>>16)&0x7ffff)); *dat = htods(0x8000 | ((strSize>>16)&0x7fff));
dat++; dat++;
} }
*dat++ = htods(strSize); *dat++ = htods(strSize);