| commit | 16524d223af41125713bd0e0ada84b84bad1b5c8 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Nov 05 17:42:13 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 05 17:42:13 2020 +0000 |
| tree | d4f7f2a28d6bc1155838a3e19b157beb141e33f9 | |
| parent | 45beaa3e63f6f1279b9516eb3eb068ba6ef1cf3b [diff] | |
| parent | eabc791b148089036077f877cc5ab97843505329 [diff] |
Merge "libgui: no use readString16Inplace" am: b1d6aaa8a5 am: eabc791b14 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1487916 Change-Id: I18bb84c8c129413dffc6cbdc73936f0eda684a72
diff --git a/libs/gui/view/Surface.cpp b/libs/gui/view/Surface.cpp index d64dfd5..d98ffc6 100644 --- a/libs/gui/view/Surface.cpp +++ b/libs/gui/view/Surface.cpp
@@ -72,13 +72,9 @@ } String16 Surface::readMaybeEmptyString16(const Parcel* parcel) { - size_t len; - const char16_t* str = parcel->readString16Inplace(&len); - if (str != nullptr) { - return String16(str, len); - } else { - return String16(); - } + std::optional<String16> str; + parcel->readString16(&str); + return str.value_or(String16()); } } // namespace view