Merge policy from frameworks/policies/base

[android/aapt.git] / StringPool.cpp

diff --git a/StringPool.cpp b/StringPool.cpp
index ec585913e441a34b284be8ab554ff723b0a862a8..a09cec05110b4102f284225d2f0ff0526dc962c5 100644 (file)
--- a/StringPool.cpp
+++ b/StringPool.cpp
@@ -25,8 +25,12 @@ void printStringPool(const ResStringPool* pool)
     const size_t NS = pool->size();
     for (size_t s=0; s<NS; s++) {
         size_t len;
-        printf("String #%d: %s\n", s,
-                String8(pool->stringAt(s, &len)).string());
+        const char *str = (const char*)pool->string8At(s, &len);
+        if (str == NULL) {
+            str = String8(pool->stringAt(s, &len)).string();
+        }
+
+        printf("String #%ld: %s\n", s, str);
     }
 }