diff options
author | 2023-08-29 22:06:33 +0000 | |
---|---|---|
committer | 2023-08-29 22:06:33 +0000 | |
commit | 38bd1de8b89699a9a965e8cdd875faa9b7fe5b85 (patch) | |
tree | 5557d7dbfe89a8e756fbe4cac7666a8f6c7062c0 /libs/androidfw/AssetManager2.cpp | |
parent | 656fd747790589a524429f363c8082b186ca5c39 (diff) | |
parent | 8f74b2a12bbb6088e4225dd21b5bf070f48a0d88 (diff) |
Merge "Migrate from android::String isEmpty to empty [aapt]" into main
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 5ffec34be397..652346976c67 100644 --- a/libs/androidfw/AssetManager2.cpp +++ b/libs/androidfw/AssetManager2.cpp @@ -1013,13 +1013,13 @@ std::string AssetManager2::GetLastResourceResolution() const { const auto& assets = GetApkAssets(step.cookie); log_stream << "\n\t" << prefix << ": " << (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(); |