Merge changes Ic400e8d1,If108059c (8ee52270) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -193,8 +193,8 @@ SurfaceFlinger::SurfaceFlinger()
		mHasPoweredOff(false),
		mNumLayers(0),
		mVrFlingerRequestsDisplay(false),
		mMainThreadId(std::this_thread::get_id())
		{
		mMainThreadId(std::this_thread::get_id()),
		mCreateBufferQueue(&BufferQueue::createBufferQueue) {
		ALOGI("SurfaceFlinger is starting");

		vsyncPhaseOffsetNs = getInt64< ISurfaceFlingerConfigs,
		@@ -2218,7 +2218,7 @@ void SurfaceFlinger::processDisplayChangesLocked() {
		sp<IGraphicBufferProducer> producer;
		sp<IGraphicBufferProducer> bqProducer;
		sp<IGraphicBufferConsumer> bqConsumer;
		BufferQueue::createBufferQueue(&bqProducer, &bqConsumer);
		mCreateBufferQueue(&bqProducer, &bqConsumer, false);

		int32_t hwcId = -1;
		if (state.isVirtualDisplay()) {

services/surfaceflinger/SurfaceFlinger.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,8 @@ class ColorLayer;
		class DisplayEventConnection;
		class EventControlThread;
		class EventThread;
		class IGraphicBufferConsumer;
		class IGraphicBufferProducer;
		class InjectVSyncSource;
		class Layer;
		class Surface;
		@@ -822,6 +824,12 @@ private:
		float mSaturation = 1.0f;
		bool mForceNativeColorMode = false;

		using CreateBufferQueueFunction =
		std::function<void(sp<IGraphicBufferProducer>* /* outProducer */,
		sp<IGraphicBufferConsumer>* /* outConsumer */,
		bool /* consumerIsSurfaceFlinger */)>;
		CreateBufferQueueFunction mCreateBufferQueue;

		SurfaceFlingerBE mBE;
		};
		}; // namespace android

services/surfaceflinger/tests/unittests/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@ cc_test {
		"DisplayTransactionTest.cpp",
		"MockComposer.cpp",
		"MockEventThread.cpp",
		"MockGraphicBufferConsumer.cpp",
		"MockGraphicBufferProducer.cpp",
		"MockRenderEngine.cpp",
		],
		static_libs: [

services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp

+37 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,8 @@

		#include "MockComposer.h"
		#include "MockEventThread.h"
		#include "MockGraphicBufferConsumer.h"
		#include "MockGraphicBufferProducer.h"
		#include "MockRenderEngine.h"
		#include "TestableSurfaceFlinger.h"

		@@ -53,6 +55,8 @@ protected:
		void setupComposer(int virtualDisplayCount);
		void setupPrimaryDisplay(int width, int height);

		void expectFramebufferQueuePairCreation(int width, int height);

		TestableSurfaceFlinger mFlinger;
		mock::EventThread* mEventThread = new mock::EventThread();

		@@ -61,6 +65,10 @@ protected:
		// to keep a reference to them for use in setting up call expectations.
		RE::mock::RenderEngine* mRenderEngine = new RE::mock::RenderEngine();
		Hwc2::mock::Composer* mComposer = new Hwc2::mock::Composer();

		// These mocks are created only when expected to be created via a factory.
		sp<mock::GraphicBufferConsumer> mConsumer;
		sp<mock::GraphicBufferProducer> mProducer;
		};

		DisplayTransactionTest::DisplayTransactionTest() {
		@@ -68,6 +76,10 @@ DisplayTransactionTest::DisplayTransactionTest() {
		::testing::UnitTest::GetInstance()->current_test_info();
		ALOGD("**** Setting up for %s.%s\n", test_info->test_case_name(), test_info->name());

		mFlinger.setCreateBufferQueueFunction([](auto, auto, auto) {
		ADD_FAILURE() << "Unexpected request to create a buffer queue.";
		});

		mFlinger.mutableEventThread().reset(mEventThread);
		mFlinger.setupRenderEngine(std::unique_ptr<RE::RenderEngine>(mRenderEngine));

		@@ -122,6 +134,27 @@ void DisplayTransactionTest::setupPrimaryDisplay(int width, int height) {
		Mock::VerifyAndClear(mComposer);
		}

		void DisplayTransactionTest::expectFramebufferQueuePairCreation(int width, int height) {
		mConsumer = new mock::GraphicBufferConsumer();
		mProducer = new mock::GraphicBufferProducer();

		mFlinger.setCreateBufferQueueFunction([this](auto outProducer, auto outConsumer, bool) {
		*outProducer = mProducer;
		*outConsumer = mConsumer;
		});

		EXPECT_CALL(*mConsumer, consumerConnect(_, false)).WillOnce(Return(NO_ERROR));
		EXPECT_CALL(*mConsumer, setConsumerName(_)).WillRepeatedly(Return(NO_ERROR));
		EXPECT_CALL(*mConsumer,
		setConsumerUsageBits(GRALLOC_USAGE_HW_RENDER \| GRALLOC_USAGE_HW_COMPOSER \|
		GRALLOC_USAGE_HW_FB))
		.WillRepeatedly(Return(NO_ERROR));
		EXPECT_CALL(*mConsumer, setDefaultBufferSize(width, height)).WillRepeatedly(Return(NO_ERROR));
		EXPECT_CALL(*mConsumer, setMaxAcquiredBufferCount(_)).WillRepeatedly(Return(NO_ERROR));

		EXPECT_CALL(*mProducer, allocateBuffers(0, 0, 0, 0)).WillRepeatedly(Return());
		}

		TEST_F(DisplayTransactionTest, processDisplayChangesLockedProcessesPrimaryDisplayConnected) {
		using android::hardware::graphics::common::V1_0::ColorMode;

		@@ -135,10 +168,11 @@ TEST_F(DisplayTransactionTest, processDisplayChangesLockedProcessesPrimaryDispla
		EXPECT_CALL(*mComposer, getColorModes(DisplayDevice::DISPLAY_PRIMARY, _))
		.WillOnce(DoAll(SetArgPointee<1>(std::vector<ColorMode>({ColorMode::NATIVE})),
		Return(Error::NONE)));

		EXPECT_CALL(*mComposer, getHdrCapabilities(DisplayDevice::DISPLAY_PRIMARY, _, _, _, _))
		.WillOnce(DoAll(SetArgPointee<1>(std::vector<Hdr>()), Return(Error::NONE)));

		expectFramebufferQueuePairCreation(1920, 1080);

		auto reSurface = new RE::mock::Surface();
		EXPECT_CALL(*mRenderEngine, createSurface())
		.WillOnce(Return(ByMove(std::unique_ptr<RE::Surface>(reSurface))));
		@@ -166,6 +200,8 @@ TEST_F(DisplayTransactionTest, processDisplayChangesLockedProcessesPrimaryDispla

		EXPECT_CALL(*mComposer, setVsyncEnabled(0, IComposerClient::Vsync::DISABLE))
		.WillOnce(Return(Error::NONE));

		EXPECT_CALL(*mConsumer, consumerDisconnect()).Times(1);
		}

		} // namespace

services/surfaceflinger/tests/unittests/MockGraphicBufferConsumer.cpp

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include "MockGraphicBufferConsumer.h"

		namespace android {
		namespace mock {

		// Explicit default instantiation is recommended.
		GraphicBufferConsumer::GraphicBufferConsumer() = default;
		GraphicBufferConsumer::~GraphicBufferConsumer() = default;

		} // namespace mock
		} // namespace android
		No newline at end of file