From 7e22cab784f64c658b8a41fa1fb22cf7bd44c65e Mon Sep 17 00:00:00 2001 From: Tomasz Wasilczyk Date: Thu, 24 Aug 2023 19:02:33 +0000 Subject: Migrate from android::String isEmpty to empty [aapt] This empty method is different from the old one - it aligns with std::string definition. Bug: 295394788 Test: make checkbuild Change-Id: I1900f2285ee3c3b1eb57d2cef3990896a64dae01 Merged-In: I1900f2285ee3c3b1eb57d2cef3990896a64dae01 --- libs/androidfw/AssetManager2.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs/androidfw/AssetManager2.cpp') diff --git a/libs/androidfw/AssetManager2.cpp b/libs/androidfw/AssetManager2.cpp index 400829e15364..fc9dd145dc5d 100644 --- a/libs/androidfw/AssetManager2.cpp +++ b/libs/androidfw/AssetManager2.cpp @@ -890,13 +890,13 @@ std::string AssetManager2::GetLastResourceResolution() const { } log_stream << "\n\t" << prefix->second << ": " << apk_assets_[step.cookie]->GetDebugName(); - 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(); -- cgit v1.2.3-59-g8ed1b