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

Commit de94d0f2 authored by chaviw's avatar chaviw
Browse files

Fix uninitialized variable when creating LayerCreationArgs 

Test: SurfaceFlinger_test.MirrorLayerTest#MirrorBufferLayer
Fixes: 148143913
Change-Id: I21929a0408bd4b37d5d6eb0898d2c8e96ef6f694
parent e9899161

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"

        }

}