diff options
| author | 2020-01-31 23:34:48 +0000 | |
|---|---|---|
| committer | 2020-01-31 23:34:48 +0000 | |
| commit | 5ca59db02b5338df237faad94e8d6f24f3ab11c7 (patch) | |
| tree | 3eb2d0dc8ac0de3dda0455797b45e4a1c17ae685 | |
| parent | 917aa94579326548d76d7f322d5f82236f322de4 (diff) | |
| parent | da8a9d11261083e8dcff78f9d82be8e3d2d0e0b5 (diff) | |
Merge "Fix failing test in CompositionTest."
| -rw-r--r-- | services/surfaceflinger/tests/unittests/CompositionTest.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/surfaceflinger/tests/unittests/CompositionTest.cpp b/services/surfaceflinger/tests/unittests/CompositionTest.cpp index 98cc023953..c6d8a2ee32 100644 --- a/services/surfaceflinger/tests/unittests/CompositionTest.cpp +++ b/services/surfaceflinger/tests/unittests/CompositionTest.cpp @@ -713,7 +713,9 @@ struct BaseLayerProperties { struct DefaultLayerProperties : public BaseLayerProperties<DefaultLayerProperties> {}; -struct ColorLayerProperties : public BaseLayerProperties<ColorLayerProperties> {}; +struct ColorLayerProperties : public BaseLayerProperties<ColorLayerProperties> { + static constexpr IComposerClient::BlendMode BLENDMODE = IComposerClient::BlendMode::NONE; +}; struct SidebandLayerProperties : public BaseLayerProperties<SidebandLayerProperties> { using Base = BaseLayerProperties<SidebandLayerProperties>; |