diff options
| author | 2023-09-13 22:08:53 +0000 | |
|---|---|---|
| committer | 2023-09-13 22:08:53 +0000 | |
| commit | d001ea5b7242f110530e339d479b28b29dadc242 (patch) | |
| tree | 461583516b23b03f09774f48e416790fed432551 /tools/aapt/StringPool.cpp | |
| parent | 20bb26382d5244b979baa8a6d9a42cc92f208d5b (diff) | |
| parent | 41363ba9fceec76e0233db8889d75e986b91f39a (diff) | |
Merge "Don't depend on String8 cast to C string" into main am: 41363ba9fc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2748044
Change-Id: I0ad1370690eb3763c4d2a7a361bc91f22fd15919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt/StringPool.cpp')
| -rw-r--r-- | tools/aapt/StringPool.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/aapt/StringPool.cpp b/tools/aapt/StringPool.cpp index 8d0268393433..1af8d6f67bd3 100644 --- a/tools/aapt/StringPool.cpp +++ b/tools/aapt/StringPool.cpp @@ -472,13 +472,13 @@ status_t StringPool::writeStringBlock(const sp<AaptFile>& pool) ENCODE_LENGTH(strings, sizeof(uint8_t), encSize) - strncpy((char*)strings, encStr, encSize+1); + strncpy((char*)strings, encStr.c_str(), encSize + 1); } else { char16_t* strings = (char16_t*)dat; ENCODE_LENGTH(strings, sizeof(char16_t), strSize) - strcpy16_htod(strings, ent.value); + strcpy16_htod(strings, ent.value.c_str()); } strPos += totalSize; @@ -592,7 +592,7 @@ ssize_t StringPool::offsetForString(const String16& val) const ssize_t res = indices != NULL && indices->size() > 0 ? indices->itemAt(0) : -1; if (kIsDebug) { printf("Offset for string %s: %zd (%s)\n", String8(val).c_str(), res, - res >= 0 ? String8(mEntries[mEntryArray[res]].value).c_str() : String8()); + res >= 0 ? String8(mEntries[mEntryArray[res]].value).c_str() : ""); } return res; } |