Merge "libgui: no use readString16Inplace" am: b1d6aaa8a5 am: eabc791b14 am: 16524d223a am: e1b2728bce

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1487916

Change-Id: I52d5961f73218bef5fbb4a769806ba54dbc252ff

1 files changed, 3 insertions, 7 deletions

diff --git a/libs/gui/view/Surface.cpp b/libs/gui/view/Surface.cpp
index 3e49de6dc8..1bfe4624f1 100644
--- a/libs/gui/view/Surface.cpp
+++ b/libs/gui/view/Surface.cpp
@@ -75,13 +75,9 @@ status_t Surface::readFromParcel(const Parcel* parcel, bool nameAlreadyRead) {
 }
 
 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