Merge "SurfaceFlinger: Fix layer creation race" (ce0489d2) · Commits · e / devices / smdk4412 / android_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -3572,15 +3572,16 @@ status_t SurfaceFlinger::addClientLayer(const sp<Client>& client, const sp<IBind
	return NO_MEMORY;		return NO_MEMORY;
	}		}

			layer->updateTransformHint(mActiveDisplayTransformHint);
			if (outTransformHint) {
			*outTransformHint = mActiveDisplayTransformHint;
			}

	{		{
	std::scoped_lock<std::mutex> lock(mCreatedLayersLock);		std::scoped_lock<std::mutex> lock(mCreatedLayersLock);
	mCreatedLayers.emplace_back(layer, parent, addToRoot);		mCreatedLayers.emplace_back(layer, parent, addToRoot);
	}		}

	layer->updateTransformHint(mActiveDisplayTransformHint);
	if (outTransformHint) {
	*outTransformHint = mActiveDisplayTransformHint;
	}
	// attach this layer to the client		// attach this layer to the client
	if (client != nullptr) {		if (client != nullptr) {
	client->attachLayer(handle, layer);		client->attachLayer(handle, layer);