summaryrefslogtreecommitdiff
path: root/tools/split-select/SplitDescription.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-08-31 21:36:55 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-31 21:36:55 +0000
commit730d49c09af124c2fe592774adb62fc890d42cd7 (patch)
tree7e971778cf2e099e636ca7b45e6206fe19a7cdaa /tools/split-select/SplitDescription.cpp
parent5e509c92f4ed55af7c37799db525079c3172f51d (diff)
parentcf48bbe40742d9c7355735be599615c7b9f511a2 (diff)
Merge "[conflict] Merge "Migrate from android::String isEmpty to empty [aapt]" into main am: 2ce9592378 am: e5ee511172" into udc-dev-plus-aosp am: cf48bbe407
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24615459 Change-Id: I262fbbea873a76c4b9793bfc4be1c467c441f8a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/split-select/SplitDescription.cpp')
-rw-r--r--tools/split-select/SplitDescription.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/split-select/SplitDescription.cpp b/tools/split-select/SplitDescription.cpp
index 4e2b48e1f450..71500080193f 100644
--- a/tools/split-select/SplitDescription.cpp
+++ b/tools/split-select/SplitDescription.cpp
@@ -70,7 +70,7 @@ bool SplitDescription::match(const SplitDescription& o) const {
String8 SplitDescription::toString() const {
String8 extension;
if (abi != abi::Variant_none) {
- if (extension.isEmpty()) {
+ if (extension.empty()) {
extension.append(":");
} else {
extension.append("-");