| commit | e1b2728bce3f1d712647ec914416f0c383b497fe | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Nov 05 17:55:40 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 05 17:55:40 2020 +0000 |
| tree | 6c7d943a71431051f0c9a5412512a01f2542f9ed | |
| parent | f534e369640cc8785e03f2f2fd64ae3944db4368 [diff] | |
| parent | 16524d223af41125713bd0e0ada84b84bad1b5c8 [diff] |
Merge "libgui: no use readString16Inplace" am: b1d6aaa8a5 am: eabc791b14 am: 16524d223a Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1487916 Change-Id: I2aac865dbb611f7728c04f52caab1f8dfab9bc7f
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