Snap for 7506386 from 4019c52f68e694278e1f5833a45a04137af3780c to sc-d1-release (4731428a) · Commits · e / os / android_frameworks_native-old

cmds/installd/InstalldNativeService.cpp

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -342,8 +342,7 @@ static int restorecon_app_data_lazy(const std::string& path, const std::string&

	// If the initial top-level restorecon above changed the label, then go		// If the initial top-level restorecon above changed the label, then go
	// back and restorecon everything recursively		// back and restorecon everything recursively
	// TODO(b/190567190, b/188141923) Remove recursive fixup of com.google.android.gsf.		if (strcmp(before, after)) {
	if (strcmp(before, after) \|\| (path.find("com.google.android.gsf") != std::string::npos)) {
	if (existing) {		if (existing) {
	LOG(DEBUG) << "Detected label change from " << before << " to " << after << " at "		LOG(DEBUG) << "Detected label change from " << before << " to " << after << " at "
	<< path << "; running recursive restorecon";		<< path << "; running recursive restorecon";

libs/renderengine/skia/SkiaGLRenderEngine.cpp

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -618,9 +618,9 @@ sk_sp<SkShader> SkiaGLRenderEngine::createRuntimeEffectShader(

	if (requiresLinearEffect) {		if (requiresLinearEffect) {
	const ui::Dataspace inputDataspace =		const ui::Dataspace inputDataspace =
	mUseColorManagement ? layer->sourceDataspace : ui::Dataspace::UNKNOWN;		mUseColorManagement ? layer->sourceDataspace : ui::Dataspace::V0_SRGB_LINEAR;
	const ui::Dataspace outputDataspace =		const ui::Dataspace outputDataspace =
	mUseColorManagement ? display.outputDataspace : ui::Dataspace::UNKNOWN;		mUseColorManagement ? display.outputDataspace : ui::Dataspace::V0_SRGB_LINEAR;

	LinearEffect effect = LinearEffect{.inputDataspace = inputDataspace,		LinearEffect effect = LinearEffect{.inputDataspace = inputDataspace,
	.outputDataspace = outputDataspace,		.outputDataspace = outputDataspace,
	@@ -762,7 +762,7 @@ status_t SkiaGLRenderEngine::drawLayers(const DisplaySettings& display,
	}		}

	const ui::Dataspace dstDataspace =		const ui::Dataspace dstDataspace =
	mUseColorManagement ? display.outputDataspace : ui::Dataspace::UNKNOWN;		mUseColorManagement ? display.outputDataspace : ui::Dataspace::V0_SRGB_LINEAR;
	sk_sp<SkSurface> dstSurface = surfaceTextureRef->getOrCreateSurface(dstDataspace, grContext);		sk_sp<SkSurface> dstSurface = surfaceTextureRef->getOrCreateSurface(dstDataspace, grContext);

	SkCanvas* dstCanvas = mCapture->tryCapture(dstSurface.get());		SkCanvas* dstCanvas = mCapture->tryCapture(dstSurface.get());

libs/renderengine/tests/RenderEngineTest.cpp

+5 −8

Original line number	Original line	Diff line number	Diff line
	@@ -81,6 +81,7 @@ public:
	.setSupportsBackgroundBlur(true)		.setSupportsBackgroundBlur(true)
	.setContextPriority(renderengine::RenderEngine::ContextPriority::MEDIUM)		.setContextPriority(renderengine::RenderEngine::ContextPriority::MEDIUM)
	.setRenderEngineType(type())		.setRenderEngineType(type())
			.setUseColorManagerment(useColorManagement())
	.build();		.build();
	return renderengine::gl::GLESRenderEngine::create(reCreationArgs);		return renderengine::gl::GLESRenderEngine::create(reCreationArgs);
	}		}
	@@ -110,7 +111,7 @@ public:
	.setSupportsBackgroundBlur(true)		.setSupportsBackgroundBlur(true)
	.setContextPriority(renderengine::RenderEngine::ContextPriority::MEDIUM)		.setContextPriority(renderengine::RenderEngine::ContextPriority::MEDIUM)
	.setRenderEngineType(type())		.setRenderEngineType(type())
	.setUseColorManagerment(true)		.setUseColorManagerment(useColorManagement())
	.build();		.build();
	return renderengine::gl::GLESRenderEngine::create(reCreationArgs);		return renderengine::gl::GLESRenderEngine::create(reCreationArgs);
	}		}
	@@ -136,16 +137,12 @@ public:
	.setSupportsBackgroundBlur(true)		.setSupportsBackgroundBlur(true)
	.setContextPriority(renderengine::RenderEngine::ContextPriority::MEDIUM)		.setContextPriority(renderengine::RenderEngine::ContextPriority::MEDIUM)
	.setRenderEngineType(type())		.setRenderEngineType(type())
	// FIXME (b/189935602): This version is currently color managed.		.setUseColorManagerment(useColorManagement())
	// We should change it and fix the tests that fail.
	//.setUseColorManagerment(false)
	.build();		.build();
	return renderengine::skia::SkiaGLRenderEngine::create(reCreationArgs);		return renderengine::skia::SkiaGLRenderEngine::create(reCreationArgs);
	}		}

	// FIXME (b/189935602): This version is currently color managed.		bool useColorManagement() const override { return false; }
	// We should change it and fix the tests that fail.
	bool useColorManagement() const override { return true; }
	};		};

	class SkiaGLESCMRenderEngineFactory : public RenderEngineFactory {		class SkiaGLESCMRenderEngineFactory : public RenderEngineFactory {
	@@ -166,7 +163,7 @@ public:
	.setSupportsBackgroundBlur(true)		.setSupportsBackgroundBlur(true)
	.setContextPriority(renderengine::RenderEngine::ContextPriority::MEDIUM)		.setContextPriority(renderengine::RenderEngine::ContextPriority::MEDIUM)
	.setRenderEngineType(type())		.setRenderEngineType(type())
	.setUseColorManagerment(true)		.setUseColorManagerment(useColorManagement())
	.build();		.build();
	return renderengine::skia::SkiaGLRenderEngine::create(reCreationArgs);		return renderengine::skia::SkiaGLRenderEngine::create(reCreationArgs);
	}		}

services/surfaceflinger/BufferQueueLayer.cpp

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -125,11 +125,16 @@ bool BufferQueueLayer::isBufferDue(nsecs_t expectedPresentTime) const {
	// -----------------------------------------------------------------------		// -----------------------------------------------------------------------

	bool BufferQueueLayer::fenceHasSignaled() const {		bool BufferQueueLayer::fenceHasSignaled() const {
			Mutex::Autolock lock(mQueueItemLock);

			if (SurfaceFlinger::enableLatchUnsignaled) {
			return true;
			}

	if (!hasFrameUpdate()) {		if (!hasFrameUpdate()) {
	return true;		return true;
	}		}

	Mutex::Autolock lock(mQueueItemLock);
	if (mQueueItems[0].item.mIsDroppable) {		if (mQueueItems[0].item.mIsDroppable) {
	// Even though this buffer's fence may not have signaled yet, it could		// Even though this buffer's fence may not have signaled yet, it could
	// be replaced by another buffer before it has a chance to, which means		// be replaced by another buffer before it has a chance to, which means

services/surfaceflinger/BufferStateLayer.cpp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -635,6 +635,10 @@ FloatRect BufferStateLayer::computeSourceBounds(const FloatRect& parentBounds) c
	// Interface implementation for BufferLayer		// Interface implementation for BufferLayer
	// -----------------------------------------------------------------------		// -----------------------------------------------------------------------
	bool BufferStateLayer::fenceHasSignaled() const {		bool BufferStateLayer::fenceHasSignaled() const {
			if (SurfaceFlinger::enableLatchUnsignaled) {
			return true;
			}

	const bool fenceSignaled =		const bool fenceSignaled =
	getDrawingState().acquireFence->getStatus() == Fence::Status::Signaled;		getDrawingState().acquireFence->getStatus() == Fence::Status::Signaled;
	if (!fenceSignaled) {		if (!fenceSignaled) {