Merge "surfaceflinger: fix a potential child layer leak" into oc-dev (989ed5c4) · Commits · e / os / android_frameworks_native-old

services/surfaceflinger/SurfaceFlinger.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -2730,8 +2730,6 @@ status_t SurfaceFlinger::removeLayer(const sp<Layer>& layer, bool topLevelOnly)
		return NO_ERROR;
		}

		index = p->removeChild(layer);

		sp<Layer> ancestor = p;
		while (ancestor->getParent() != nullptr) {
		ancestor = ancestor->getParent();
		@@ -2740,6 +2738,8 @@ status_t SurfaceFlinger::removeLayer(const sp<Layer>& layer, bool topLevelOnly)
		ALOGE("removeLayer called with a layer whose parent has been removed");
		return NAME_NOT_FOUND;
		}

		index = p->removeChild(layer);
		} else {
		index = mCurrentState.layersSortedByZ.remove(layer);
		}

+15 −1

Original line number	Diff line number	Diff line
		@@ -2327,8 +2327,13 @@ status_t SurfaceFlinger::addClientLayer(const sp<Client>& client,
		if (parent == nullptr) {
		mCurrentState.layersSortedByZ.add(lbc);
		} else {
		if (mCurrentState.layersSortedByZ.indexOf(parent) < 0) {
		ALOGE("addClientLayer called with a removed parent");
		return NAME_NOT_FOUND;
		}
		parent->addChild(lbc);
		}

		mGraphicBufferProducerList.add(IInterface::asBinder(gbc));
		mLayersAdded = true;
		mNumLayers++;
		@@ -2350,6 +2355,15 @@ status_t SurfaceFlinger::removeLayer(const sp<Layer>& layer, bool topLevelOnly)
		return NO_ERROR;
		}

		sp<Layer> ancestor = p;
		while (ancestor->getParent() != nullptr) {
		ancestor = ancestor->getParent();
		}
		if (mCurrentState.layersSortedByZ.indexOf(ancestor) < 0) {
		ALOGE("removeLayer called with a layer whose parent has been removed");
		return NAME_NOT_FOUND;
		}

		index = p->removeChild(layer);
		} else {
		index = mCurrentState.layersSortedByZ.remove(layer);
		@@ -2371,7 +2385,7 @@ status_t SurfaceFlinger::removeLayer(const sp<Layer>& layer, bool topLevelOnly)

		mLayersPendingRemoval.add(layer);
		mLayersRemoved = true;
		mNumLayers--;
		mNumLayers -= 1 + layer->getChildrenCount();
		setTransactionFlags(eTransactionNeeded);
		return NO_ERROR;
		}