diff options
| author | 2023-08-31 21:36:55 +0000 | |
|---|---|---|
| committer | 2023-08-31 21:36:55 +0000 | |
| commit | 730d49c09af124c2fe592774adb62fc890d42cd7 (patch) | |
| tree | 7e971778cf2e099e636ca7b45e6206fe19a7cdaa /libs/androidfw/AssetManager2.cpp | |
| parent | 5e509c92f4ed55af7c37799db525079c3172f51d (diff) | |
| parent | cf48bbe40742d9c7355735be599615c7b9f511a2 (diff) | |
Merge "[conflict] Merge "Migrate from android::String isEmpty to empty [aapt]" into main am: 2ce9592378 am: e5ee511172" into udc-dev-plus-aosp am: cf48bbe407
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24615459
Change-Id: I262fbbea873a76c4b9793bfc4be1c467c441f8a4
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/androidfw/AssetManager2.cpp b/libs/androidfw/AssetManager2.cpp index d33b592bddc6..bff197cc290f 100644 --- a/libs/androidfw/AssetManager2.cpp +++ b/libs/androidfw/AssetManager2.cpp @@ -958,13 +958,13 @@ std::string AssetManager2::GetLastResourceResolution() const { const auto& assets = GetApkAssets(step.cookie); log_stream << "\n\t" << prefix->second << ": " << (assets ? assets->GetDebugName() : "<null>") << " #" << step.cookie; - if (!step.config_name.isEmpty()) { + if (!step.config_name.empty()) { log_stream << " - " << step.config_name; } } log_stream << "\nBest matching is from " - << (last_resolution_.best_config_name.isEmpty() ? "default" + << (last_resolution_.best_config_name.empty() ? "default" : last_resolution_.best_config_name) << " configuration of " << last_resolution_.best_package_name; return log_stream.str(); |