diff options
| author | 2023-08-18 18:41:45 +0000 | |
|---|---|---|
| committer | 2023-08-18 18:41:45 +0000 | |
| commit | 64441287a544d12f14e526e8cffac5085ea1c1b5 (patch) | |
| tree | dec2fb0d982a90a0a7e795e629c235e44ffed03d /libs/androidfw/ObbFile.cpp | |
| parent | 36dc0ec7d2e76e33728519bcd338bb24b40e7088 (diff) | |
| parent | b370693c676505e3875b33ac8ef0469cb12254e3 (diff) | |
Merge "Use String8/16 c_str [tools]" into udc-dev-plus-aosp am: b370693c67
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24484497
Change-Id: Ib747577c2c8d235e5f3d7ecb717b54fb688013a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
| -rw-r--r-- | libs/androidfw/ObbFile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/androidfw/ObbFile.cpp b/libs/androidfw/ObbFile.cpp index 95332a35eb7d..c6a9632ee7b7 100644 --- a/libs/androidfw/ObbFile.cpp +++ b/libs/androidfw/ObbFile.cpp @@ -217,7 +217,7 @@ bool ObbFile::parseObbFile(int fd) free(scanBuf); #ifdef DEBUG - ALOGI("Obb scan succeeded: packageName=%s, version=%d\n", mPackageName.string(), mVersion); + ALOGI("Obb scan succeeded: packageName=%s, version=%d\n", mPackageName.c_str(), mVersion); #endif return true; @@ -288,7 +288,7 @@ bool ObbFile::writeTo(int fd) return false; } - if (write(fd, mPackageName.string(), packageNameLen) != (ssize_t)packageNameLen) { + if (write(fd, mPackageName.c_str(), packageNameLen) != (ssize_t)packageNameLen) { ALOGW("couldn't write package name: %s\n", strerror(errno)); return false; } |