Merge "SurfaceFlinger: Remove dead "topLevelOnly" code." (dec41d6c) · Commits · e / os / android_frameworks_native-old

services/surfaceflinger/SurfaceFlinger.cpp

+3 −7

Original line number	Diff line number	Diff line
		@@ -3193,19 +3193,15 @@ status_t SurfaceFlinger::addClientLayer(const sp<Client>& client,
		return NO_ERROR;
		}

		status_t SurfaceFlinger::removeLayer(const sp<Layer>& layer, bool topLevelOnly) {
		status_t SurfaceFlinger::removeLayer(const sp<Layer>& layer) {
		Mutex::Autolock _l(mStateLock);
		return removeLayerLocked(mStateLock, layer, topLevelOnly);
		return removeLayerLocked(mStateLock, layer);
		}

		status_t SurfaceFlinger::removeLayerLocked(const Mutex& lock, const sp<Layer>& layer,
		bool topLevelOnly) {
		status_t SurfaceFlinger::removeLayerLocked(const Mutex& lock, const sp<Layer>& layer) {
		const auto& p = layer->getParent();
		ssize_t index;
		if (p != nullptr) {
		if (topLevelOnly) {
		return NO_ERROR;
		}
		index = p->removeChild(layer);
		} else {
		index = mCurrentState.layersSortedByZ.remove(layer);

+2 −2

Original line number	Diff line number	Diff line
		@@ -592,8 +592,8 @@ private:
		void onHandleDestroyed(const sp<Layer>& layer);

		// remove a layer from SurfaceFlinger immediately
		status_t removeLayer(const sp<Layer>& layer, bool topLevelOnly = false);
		status_t removeLayerLocked(const Mutex&, const sp<Layer>& layer, bool topLevelOnly = false);
		status_t removeLayer(const sp<Layer>& layer);
		status_t removeLayerLocked(const Mutex&, const sp<Layer>& layer);

		// add a layer to SurfaceFlinger
		status_t addClientLayer(const sp<Client>& client,