diff options
author | 2023-08-24 19:02:33 +0000 | |
---|---|---|
committer | 2023-08-25 16:20:39 +0000 | |
commit | 8f74b2a12bbb6088e4225dd21b5bf070f48a0d88 (patch) | |
tree | 0579fe7d1e868e59bce9b6d72a67c8b02895794a /tools/aapt/ResourceTable.cpp | |
parent | f353aecc0b09770a24b4ddeb1d1e6d61815a1f78 (diff) |
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
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
-rw-r--r-- | tools/aapt/ResourceTable.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 449e0808806e..bc252cfff239 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -1813,7 +1813,7 @@ status_t ResourceTable::addIncludedResources(Bundle* bundle, const sp<AaptAssets mTypeIdOffset = findLargestTypeIdForPackage(assets->getIncludedResources(), mAssetsPackage); const String8& featureAfter = bundle->getFeatureAfterPackage(); - if (!featureAfter.isEmpty()) { + if (!featureAfter.empty()) { AssetManager featureAssetManager; if (!featureAssetManager.addAssetPath(featureAfter, NULL)) { fprintf(stderr, "ERROR: Feature package '%s' not found.\n", @@ -1823,7 +1823,7 @@ status_t ResourceTable::addIncludedResources(Bundle* bundle, const sp<AaptAssets const ResTable& featureTable = featureAssetManager.getResources(false); mTypeIdOffset = std::max(mTypeIdOffset, - findLargestTypeIdForPackage(featureTable, mAssetsPackage)); + findLargestTypeIdForPackage(featureTable, mAssetsPackage)); } return NO_ERROR; @@ -3252,7 +3252,7 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp<const ResourceFilter>& // If we're building splits, then each invocation of the flattening // step will have 'missing' entries. Don't warn/error for this case. - if (bundle->getSplitConfigurations().isEmpty()) { + if (bundle->getSplitConfigurations().empty()) { bool missing_entry = false; const char* log_prefix = bundle->getErrorOnMissingConfigEntry() ? "error" : "warning"; @@ -4858,7 +4858,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle, Vector<sp<XMLNode> > nodesToVisit; nodesToVisit.push(root); - while (!nodesToVisit.isEmpty()) { + while (!nodesToVisit.empty()) { sp<XMLNode> node = nodesToVisit.top(); nodesToVisit.pop(); |