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

Commit 2c7e3aa7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove camera flag from view::Surface." into main

parents 41f41ac7 fcd0792a

libs/gui/include/gui/view/Surface.h

+0 −2
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ class Surface : public Parcelable { 
    sp<IGraphicBufferProducer> graphicBufferProducer;

    sp<IBinder> surfaceControlHandle;



#if WB_LIBCAMERASERVICE_WITH_DEPENDENCIES

    // functions used to convert to a parcelable Surface so it can be passed over binder.

    static Surface fromSurface(const sp<android::Surface>& surface);

    sp<android::Surface> toSurface() const;
@@ -70,7 +69,6 @@ class Surface : public Parcelable { 
        return graphicBufferProducer < other.graphicBufferProducer;

    }

    bool operator>(const Surface& other) const { return other < *this; }

#endif



    virtual status_t writeToParcel(Parcel* parcel) const override;

    virtual status_t readFromParcel(const Parcel* parcel) override;

libs/gui/view/Surface.cpp

+0 −2
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ String16 Surface::readMaybeEmptyString16(const Parcel* parcel) { 
    return str.value_or(String16());

}



#if WB_LIBCAMERASERVICE_WITH_DEPENDENCIES

Surface Surface::fromSurface(const sp<android::Surface>& surface) {

    if (surface == nullptr) {

        ALOGE("%s: Error: view::Surface::fromSurface failed due to null surface.", __FUNCTION__);
@@ -156,7 +155,6 @@ status_t Surface::getUniqueId(uint64_t* out_id) const { 
bool Surface::isEmpty() const {

    return graphicBufferProducer == nullptr;

}

#endif



std::string Surface::toString() const {

    std::stringstream out;