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

Commit 36c7ebf6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix emulator build"

parents 8545c1d9 532b2638

services/surfaceflinger/Layer.cpp

+4 −3
Original line number Diff line number Diff line
@@ -874,9 +874,6 @@ void Layer::setPerFrameData(const sp<const DisplayDevice>& displayDevice) { 
    }

}



android_dataspace Layer::getDataSpace() const {

    return mCurrentState.dataSpace;

}

#else

void Layer::setPerFrameData(const sp<const DisplayDevice>& hw,

        HWComposer::HWCLayerInterface& layer) {
@@ -1887,6 +1884,10 @@ bool Layer::setDataSpace(android_dataspace dataSpace) { 
    return true;

}



android_dataspace Layer::getDataSpace() const {

    return mCurrentState.dataSpace;

}



uint32_t Layer::getLayerStack() const {

    auto p = getParent();

    if (p == nullptr) {

services/surfaceflinger/Layer.h

+1 −2
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ public: 
    bool setFlags(uint8_t flags, uint8_t mask);

    bool setLayerStack(uint32_t layerStack);

    bool setDataSpace(android_dataspace dataSpace);

    android_dataspace getDataSpace() const;

    uint32_t getLayerStack() const;

    void deferTransactionUntil(const sp<IBinder>& barrierHandle, uint64_t frameNumber);

    void deferTransactionUntil(const sp<Layer>& barrierLayer, uint64_t frameNumber);
@@ -275,8 +276,6 @@ public: 
    void forceClientComposition(int32_t hwcId);

    void setPerFrameData(const sp<const DisplayDevice>& displayDevice);



    android_dataspace getDataSpace() const;



    // callIntoHwc exists so we can update our local state and call

    // acceptDisplayChanges without unnecessarily updating the device's state

    void setCompositionType(int32_t hwcId, HWC2::Composition type,