From: Dianne Hackborn <hackbod@google.com>
Date: Wed, 16 Sep 2009 06:11:35 +0000 (-0700)
Subject: am 7fc39b26: Merge change 25238 into eclair
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/62ebcfc28be6492825957985187968e6aa4c3d72?hp=0096feb5e9367cd51a067079fd5bceaac435e5e5

am 7fc39b26: Merge change 25238 into eclair

Merge commit '7fc39b26fc4ec9df7d147ff34ebba90556cdb4da' into eclair-plus-aosp

* commit '7fc39b26fc4ec9df7d147ff34ebba90556cdb4da':
  Implement issue #1780928: Need support hiding nav keys.
---

diff --git a/Command.cpp b/Command.cpp
index f2cdf75..db4ac97 100644
--- a/Command.cpp
+++ b/Command.cpp
@@ -401,7 +401,7 @@ int doDump(Bundle* bundle)
             ResXMLTree tree;
             asset = assets.openNonAsset(resname, Asset::ACCESS_BUFFER);
             if (asset == NULL) {
-                fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname);
+                fprintf(stderr, "ERROR: dump failed because resource %s found\n", resname);
                 goto bail;
             }
 
@@ -427,7 +427,7 @@ int doDump(Bundle* bundle)
             ResXMLTree tree;
             asset = assets.openNonAsset(resname, Asset::ACCESS_BUFFER);
             if (asset == NULL) {
-                fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname);
+                fprintf(stderr, "ERROR: dump failed because resource %s found\n", resname);
                 goto bail;
             }
 
diff --git a/StringPool.cpp b/StringPool.cpp
index 878d3b1..715170a 100644
--- a/StringPool.cpp
+++ b/StringPool.cpp
@@ -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);