commit | ff7c699b31c209d083d830e166d483f5aa2715e1 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Sep 07 20:34:25 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 07 20:34:25 2023 +0000 |
tree | 5e97e7be66cd47f1efae13d38023a1217fe90e90 | |
parent | 4251ebc680666626c043063d28faf670165ea388 [diff] | |
parent | 0cd042eadbe9becf851eaa3e60452191ee456802 [diff] |
Merge "Migrate from android::String isEmpty to empty" into main am: 594656ed52 am: c4e9e8e72e am: 0cd042eadb Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2745913 Change-Id: Ib550b53e0fe7ce66e3c2527b4ebe279f8928382b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/cas/1.0/default/TypeConvert.cpp b/cas/1.0/default/TypeConvert.cpp index cd0efdb..cc25cf5 100644 --- a/cas/1.0/default/TypeConvert.cpp +++ b/cas/1.0/default/TypeConvert.cpp
@@ -82,7 +82,7 @@ for (size_t i = 0; i < sessionId.size(); i++) { result.appendFormat("%02x ", sessionId[i]); } - if (result.isEmpty()) { + if (result.empty()) { result.append("(null)"); } return result;
diff --git a/cas/1.1/default/TypeConvert.cpp b/cas/1.1/default/TypeConvert.cpp index 09ef41a..2ffc79a 100644 --- a/cas/1.1/default/TypeConvert.cpp +++ b/cas/1.1/default/TypeConvert.cpp
@@ -81,7 +81,7 @@ for (size_t i = 0; i < sessionId.size(); i++) { result.appendFormat("%02x ", sessionId[i]); } - if (result.isEmpty()) { + if (result.empty()) { result.append("(null)"); } return result;
diff --git a/cas/1.2/default/TypeConvert.cpp b/cas/1.2/default/TypeConvert.cpp index c4bd0dd..7d27fa1 100644 --- a/cas/1.2/default/TypeConvert.cpp +++ b/cas/1.2/default/TypeConvert.cpp
@@ -108,7 +108,7 @@ for (size_t i = 0; i < sessionId.size(); i++) { result.appendFormat("%02x ", sessionId[i]); } - if (result.isEmpty()) { + if (result.empty()) { result.append("(null)"); } return result;