commit 85486fc425122b2b1984bf323822a7b0933d8158
author Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 18 08:22:07 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 18 08:22:07 2020 +0000
tree a4513e7db35468c00486722420344671922b8562
parent 68ca207ba60ddb03ac8e9653fa45e46cfa621d04
parent 9d2a0c78bd31dd3f7d96cc838d9f4bcde1485c55

Merge "Use std::optional instead of std::unique_ptr"

include/media/MicrophoneInfo.h

diff --git a/include/media/MicrophoneInfo.h b/include/media/MicrophoneInfo.h
index 2287aca..0a24b02 100644
--- a/include/media/MicrophoneInfo.h
+++ b/include/media/MicrophoneInfo.h
@@ -205,11 +205,11 @@
 private:
     status_t readFloatVector(
             const Parcel* parcel, Vector<float> *vectorPtr, size_t defaultLength) {
-        std::unique_ptr<std::vector<float>> v;
+        std::optional<std::vector<float>> v;
         status_t result = parcel->readFloatVector(&v);
         if (result != OK) return result;
         vectorPtr->clear();
-        if (v.get() != nullptr) {
+        if (v) {
             for (const auto& iter : *v) {
                 vectorPtr->push_back(iter);
             }