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

Commit 4e623e25 authored by Bryce Lee's avatar Bryce Lee
Browse files

Add method to explicitly create Surface. 

It is sometimes necessary for a SurfaceControl client to request the
associated Surface object be created rather than reuse the cached
value. This changelist adds an additional method that performs the
same creation operations as if the Surface object was created for the
first time.

Bug: 62108743
Test: go/wm-smoke
Change-Id: I2f460f20b2d16ed9ff81cb36842bcd2f8641e03c
parent c175253b

include/gui/SurfaceControl.h

+2 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ public: 
            const sp<SurfaceControl>& control, Parcel* parcel);



    sp<Surface> getSurface() const;

    sp<Surface> createSurface() const;

    sp<IBinder> getHandle() const;



    status_t clearLayerFrameStats() const;
@@ -155,6 +156,7 @@ private: 


    ~SurfaceControl();



    sp<Surface> generateSurfaceLocked() const;

    status_t validate() const;

    void destroy();

libs/gui/SurfaceControl.cpp

+16 −3
Original line number Diff line number Diff line
@@ -237,17 +237,30 @@ status_t SurfaceControl::writeSurfaceToParcel( 
    return parcel->writeStrongBinder(IInterface::asBinder(bp));

}



sp<Surface> SurfaceControl::getSurface() const

sp<Surface> SurfaceControl::generateSurfaceLocked() const

{

    Mutex::Autolock _l(mLock);

    if (mSurfaceData == 0) {

    // This surface is always consumed by SurfaceFlinger, so the

    // producerControlledByApp value doesn't matter; using false.

    mSurfaceData = new Surface(mGraphicBufferProducer, false);



    return mSurfaceData;

}



sp<Surface> SurfaceControl::getSurface() const

{

    Mutex::Autolock _l(mLock);

    if (mSurfaceData == 0) {

        return generateSurfaceLocked();

    }

    return mSurfaceData;

}



sp<Surface> SurfaceControl::createSurface() const

{

    Mutex::Autolock _l(mLock);

    return generateSurfaceLocked();

}



sp<IBinder> SurfaceControl::getHandle() const

{

    Mutex::Autolock lock(mLock);