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

Commit 38737fa0 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "Remove unused global const variable" into main am: d1dd8f7a am: b71f4301 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2902238



Change-Id: I4b2bb0ec7a0be476d061e0a98984be234182d216
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79d81018 b71f4301

services/surfaceflinger/CompositionEngine/tests/OutputTest.cpp

+0 −2
Original line number Diff line number Diff line
@@ -3403,7 +3403,6 @@ struct OutputComposeSurfacesTest : public testing::Test { 
    static const mat4 kDefaultColorTransformMat;



    static const Region kDebugRegion;

    static const compositionengine::CompositionRefreshArgs kDefaultRefreshArgs;

    static const HdrCapabilities kHdrCapabilities;



    StrictMock<mock::CompositionEngine> mCompositionEngine;
@@ -3426,7 +3425,6 @@ const Rect OutputComposeSurfacesTest::kDefaultOutputFrame{1001, 1002, 1003, 1004 
const Rect OutputComposeSurfacesTest::kDefaultOutputViewport{1005, 1006, 1007, 1008};

const Rect OutputComposeSurfacesTest::kDefaultOutputDestinationClip{1013, 1014, 1015, 1016};

const mat4 OutputComposeSurfacesTest::kDefaultColorTransformMat{mat4() * 0.5f};

const compositionengine::CompositionRefreshArgs OutputComposeSurfacesTest::kDefaultRefreshArgs;

const Region OutputComposeSurfacesTest::kDebugRegion{Rect{100, 101, 102, 103}};



const HdrCapabilities OutputComposeSurfacesTest::