Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 106e3025 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Use std::optional for nullable" am: f5f3a4a0 

Change-Id: Ib6a5d008a955d9b0ceff9bdbbd41b4acbe989695
parents 3af8d573 f5f3a4a0

media/libaudioclient/AudioAttributes.cpp

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ status_t AudioAttributes::writeToParcel(Parcel *parcel) const 
        parcel->writeInt32(0);

    } else {

        parcel->writeInt32(1);

        parcel->writeUtf8AsUtf16(mAttributes.tags);

        parcel->writeUtf8AsUtf16(std::string(mAttributes.tags));

    }

    parcel->writeInt32(static_cast<int32_t>(mStreamType));

    parcel->writeUint32(static_cast<uint32_t>(mGroupId));

services/camera/libcameraservice/CameraService.h

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include <string>

#include <map>

#include <memory>

#include <optional>

#include <utility>

#include <unordered_map>

#include <unordered_set>