diff options
| author | 2023-09-13 23:04:25 +0000 | |
|---|---|---|
| committer | 2023-09-13 23:04:25 +0000 | |
| commit | 834467bdcc1a799ece112553070593bbd4940455 (patch) | |
| tree | ff090d8a29609368f294044451100befff6ce5eb /libs/androidfw/AssetManager2.cpp | |
| parent | 36a4442577e66659f9769c32b52315cec4a4acf6 (diff) | |
| parent | d001ea5b7242f110530e339d479b28b29dadc242 (diff) | |
Merge "Don't depend on String8 cast to C string" into main am: 41363ba9fc am: d001ea5b72
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2748044
Change-Id: Icc8df7b364fcda5e6cc734bdbef49e2d7dc43b76
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 c9bdbb4f3fbc..5e04bfea2bef 100644 --- a/libs/androidfw/AssetManager2.cpp +++ b/libs/androidfw/AssetManager2.cpp @@ -971,7 +971,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(); } |