]> git.saurik.com Git - android/aapt.git/commitdiff
am 66c70e13: Merge change 23529 into eclair
authorEric Fischer <enf@google.com>
Wed, 2 Sep 2009 18:19:19 +0000 (11:19 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Sep 2009 18:19:19 +0000 (11:19 -0700)
Merge commit '66c70e13d9f39cf82df8542fe53f2049d3f2062e' into eclair-plus-aosp

* commit '66c70e13d9f39cf82df8542fe53f2049d3f2062e':
  Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.

StringPool.cpp

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