diff options
| author | 2023-08-18 19:43:38 +0000 | |
|---|---|---|
| committer | 2023-08-18 19:43:38 +0000 | |
| commit | 9836a1cebb1a95112140c96fad1104d191de391e (patch) | |
| tree | b2868830f6884bd31c5444feee6708293c97156a /tools/aapt2/Debug.cpp | |
| parent | 5eef9a145702b2069656ff6cfd147adfe1adbaab (diff) | |
| parent | 0e91b7269483d6392203606b3a766807d175b4ba (diff) | |
Merge "Use String8/16 c_str [tools]" into udc-dev-plus-aosp am: b370693c67 am: 64441287a5 am: 0e91b72694
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24484497
Change-Id: I1436ad48bfcbe44c5fc67d41f76cd86cd6a62048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/Debug.cpp')
| -rw-r--r-- | tools/aapt2/Debug.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt2/Debug.cpp b/tools/aapt2/Debug.cpp index cac4edd8db21..6a17ef85a755 100644 --- a/tools/aapt2/Debug.cpp +++ b/tools/aapt2/Debug.cpp @@ -457,7 +457,7 @@ void Debug::DumpResStringPool(const android::ResStringPool* pool, text::Printer* const size_t NS = pool->size(); for (size_t s=0; s<NS; s++) { auto str = pool->string8ObjectAt(s); - printer->Print(StringPrintf("String #%zd : %s\n", s, str.has_value() ? str->string() : "")); + printer->Print(StringPrintf("String #%zd : %s\n", s, str.has_value() ? str->c_str() : "")); } } |