diff options
| author | 2023-09-13 22:08:53 +0000 | |
|---|---|---|
| committer | 2023-09-13 22:08:53 +0000 | |
| commit | d001ea5b7242f110530e339d479b28b29dadc242 (patch) | |
| tree | 461583516b23b03f09774f48e416790fed432551 /libs/androidfw/AssetManager2.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 'libs/androidfw/AssetManager2.cpp')
| -rw-r--r-- | libs/androidfw/AssetManager2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/androidfw/AssetManager2.cpp b/libs/androidfw/AssetManager2.cpp index 12be1e0d1bd4..c712d01fe1c2 100644 --- a/libs/androidfw/AssetManager2.cpp +++ b/libs/androidfw/AssetManager2.cpp @@ -913,7 +913,7 @@ std::string AssetManager2::GetLastResourceResolution() const { log_stream << "\nBest matching is from " << (last_resolution_.best_config_name.empty() ? "default" - : last_resolution_.best_config_name) + : last_resolution_.best_config_name.c_str()) << " configuration of " << last_resolution_.best_package_name; return log_stream.str(); } |