commit f674100ba8a40ff989573d5826fe645a6c8894a0
author Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 05 17:52:14 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 05 17:52:14 2020 +0000
tree 2ecab64e53dca933d776a22f0fc5590c4c76f9ac
parent a83d0841b896bdb0b16c85465abf372ed229c955
parent 49814c55556d72661d547412537812e3d861578e

Merge "no use readString16Inplace" am: b7c14e4cd8 am: 13499e5a9a am: 002ef2d90c am: 49814c5555

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1486503

Change-Id: Ie2234d77666257b716fd5efc6dc8f98ca22c15d0

camera/camera2/CaptureRequest.cpp

diff --git a/camera/camera2/CaptureRequest.cpp b/camera/camera2/CaptureRequest.cpp
index 1843ec4..ebc09d7 100644
--- a/camera/camera2/CaptureRequest.cpp
+++ b/camera/camera2/CaptureRequest.cpp
@@ -94,12 +94,12 @@
     // Do not distinguish null arrays from 0-sized arrays.
     for (int32_t i = 0; i < size; ++i) {
         // Parcel.writeParcelableArray
-        size_t len;
-        const char16_t* className = parcel->readString16Inplace(&len);
+        std::optional<std::string> className;
+        parcel->readUtf8FromUtf16(&className);
         ALOGV("%s: Read surface class = %s", __FUNCTION__,
-              className != NULL ? String8(className).string() : "<null>");
+              className.value_or("<null>").c_str());
 
-        if (className == NULL) {
+        if (className == std::nullopt) {
             continue;
         }