diff options
| author | 2023-08-31 10:05:54 +0000 | |
|---|---|---|
| committer | 2023-08-31 10:05:54 +0000 | |
| commit | e5ee511172be798f860ea7a61858037f75903d36 (patch) | |
| tree | 9a50936c2c02aaa2ac05c221d659e85787741305 /tools/aapt/Resource.cpp | |
| parent | 9d0bcc2935d9c8633d5423ab2fb1ff14b2d1f446 (diff) | |
| parent | 2ce9592378ced7688e6107791de219139d0f231d (diff) | |
Merge "Migrate from android::String isEmpty to empty [aapt]" into main am: 2ce9592378
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2725659
Change-Id: I138a5369aebbe74737992252c2b1fac6cf4ce16f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt/Resource.cpp')
| -rw-r--r-- | tools/aapt/Resource.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<AaptAssets>& assets, sp<ApkBuil packageType = ResourceTable::SharedLibrary; } else if (bundle->getExtending()) { 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<AaptFile>& 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) { |