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 --- tools/aapt/Resource.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/aapt/Resource.cpp') diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp index 9c944e0de075..4a360ed1c80e 100644 --- a/tools/aapt/Resource.cpp +++ b/tools/aapt/Resource.cpp @@ -1285,7 +1285,7 @@ status_t buildResources(Bundle* bundle, const sp& assets, spgetExtending()) { packageType = ResourceTable::System; - } else if (!bundle->getFeatureOfPackage().isEmpty()) { + } else if (!bundle->getFeatureOfPackage().empty()) { packageType = ResourceTable::AppFeature; } @@ -3144,7 +3144,7 @@ writeProguardForXml(ProguardKeepSet* keep, const sp& layoutFile, tree.restart(); - if (!startTags.isEmpty()) { + if (!startTags.empty()) { bool haveStart = false; while ((code=tree.next()) != ResXMLTree::END_DOCUMENT && code != ResXMLTree::BAD_DOCUMENT) { if (code != ResXMLTree::START_TAG) { -- cgit v1.2.3-59-g8ed1b