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

Commit 2a36497e authored by Jesse Hall's avatar Jesse Hall Committed by Android (Google) Code Review
Browse files

Merge "Stop using default value for Surface producerControlledByApp parameter" into klp-dev

parents a2ba428a 83cafffe

libs/gui/SurfaceControl.cpp

+7 −5
Original line number Diff line number Diff line
@@ -181,7 +181,9 @@ sp<Surface> SurfaceControl::getSurface() const 
{

    Mutex::Autolock _l(mLock);

    if (mSurfaceData == 0) {

        mSurfaceData = new Surface(mGraphicBufferProducer);

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

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

        mSurfaceData = new Surface(mGraphicBufferProducer, false);

    }

    return mSurfaceData;

}

services/surfaceflinger/DisplayDevice.cpp

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ DisplayDevice::DisplayDevice( 
      mLayerStack(NO_LAYER_STACK),

      mOrientation()

{

    mNativeWindow = new Surface(producer);

    mNativeWindow = new Surface(producer, false);

    ANativeWindow* const window = mNativeWindow.get();



    int format;

services/surfaceflinger/SurfaceFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2782,7 +2782,7 @@ status_t SurfaceFlinger::captureScreenImplLocked( 


    // create a surface (because we're a producer, and we need to

    // dequeue/queue a buffer)

    sp<Surface> sur = new Surface(producer);

    sp<Surface> sur = new Surface(producer, false);

    ANativeWindow* window = sur.get();



    status_t result = NO_ERROR;