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

Commit e115808a authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Android (Google) Code Review
Browse files

Merge "Fix uninitialized variable when creating LayerCreationArgs"

parents 4005d6c8 de94d0f2

services/surfaceflinger/Layer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ Layer::~Layer() { 
    mFlinger->onLayerDestroyed(this);

}



LayerCreationArgs::LayerCreationArgs(SurfaceFlinger* flinger, const sp<Client>& client,

LayerCreationArgs::LayerCreationArgs(SurfaceFlinger* flinger, const sp<Client> client,

                                     std::string name, uint32_t w, uint32_t h, uint32_t flags,

                                     LayerMetadata metadata)

      : flinger(flinger),

services/surfaceflinger/Layer.h

+2 −2
Original line number Diff line number Diff line
@@ -78,11 +78,11 @@ class SurfaceInterceptor; 
// ---------------------------------------------------------------------------



struct LayerCreationArgs {

    LayerCreationArgs(SurfaceFlinger* flinger, const sp<Client>& client, std::string name,

    LayerCreationArgs(SurfaceFlinger* flinger, const sp<Client> client, std::string name,

                      uint32_t w, uint32_t h, uint32_t flags, LayerMetadata metadata);



    SurfaceFlinger* flinger;

    const sp<Client>& client;

    const sp<Client> client;

    std::string name;

    uint32_t w;

    uint32_t h;

services/surfaceflinger/tests/SurfaceFlinger_test.filter

+1 −1
Original line number Diff line number Diff line 
{

        "presubmit": {

            "filter": "*:-LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest.SetCornerRadius/2:LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest.SetCornerRadius/3:LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest.SetCornerRadiusChildCrop/2:LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest.SetCornerRadiusChildCrop/3:MirrorLayerTest.MirrorBufferLayer"

            "filter": "*:-LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest.SetCornerRadius/2:LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest.SetCornerRadius/3:LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest.SetCornerRadiusChildCrop/2:LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest.SetCornerRadiusChildCrop/3"

        }

}