diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-10 18:05:19 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-10 18:05:19 -0800 |
| commit | 218aa94581293876a4283f8d5908843c8f818e3a (patch) | |
| tree | b76fdd7443fc8055786b7461701ab027a0e195d6 | |
| parent | 9de0dba37cdb74a21e561c5235757318f1812e3d (diff) | |
| parent | bb79f64b89bd7be7019035a0347c681e6f39fe6b (diff) | |
| download | frameworks_base-218aa94581293876a4283f8d5908843c8f818e3a.zip frameworks_base-218aa94581293876a4283f8d5908843c8f818e3a.tar.gz frameworks_base-218aa94581293876a4283f8d5908843c8f818e3a.tar.bz2 | |
Merge change I6478884a into eclair-mr2
* changes:
Add string resource type inspection
| -rw-r--r-- | include/utils/ResourceTypes.h | 4 | ||||
| -rw-r--r-- | libs/utils/ResourceTypes.cpp | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/include/utils/ResourceTypes.h b/include/utils/ResourceTypes.h index a845908..6090f60 100644 --- a/include/utils/ResourceTypes.h +++ b/include/utils/ResourceTypes.h @@ -454,6 +454,10 @@ public: size_t size() const; +#ifndef HAVE_ANDROID_OS + bool isUTF8() const; +#endif + private: status_t mError; void* mOwnedData; diff --git a/libs/utils/ResourceTypes.cpp b/libs/utils/ResourceTypes.cpp index afca814..e8bd5cf 100644 --- a/libs/utils/ResourceTypes.cpp +++ b/libs/utils/ResourceTypes.cpp @@ -576,6 +576,13 @@ size_t ResStringPool::size() const return (mError == NO_ERROR) ? mHeader->stringCount : 0; } +#ifndef HAVE_ANDROID_OS +bool ResStringPool::isUTF8() const +{ + return (mHeader->flags&ResStringPool_header::UTF8_FLAG)!=0; +} +#endif + // -------------------------------------------------------------------- // -------------------------------------------------------------------- // -------------------------------------------------------------------- @@ -4016,7 +4023,8 @@ void ResTable::print_value(const Package* pkg, const Res_value& value) const if (str == NULL) { printf("(string) null\n"); } else { - printf("(string) \"%s\"\n", + printf("(string%d) \"%s\"\n", + pkg->header->values.isUTF8()?8:16, String8(str, len).string()); } } else if (value.dataType == Res_value::TYPE_FLOAT) { |