Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52658009 authored Aug 08, 2017 by Chavi Weingarten Committed by android-build-merger Aug 08, 2017

Merge "Update LayerVector's order after modifying relative layer."

am: 30b390cb

Change-Id: Iefdb5f43cd8566f36f2ebbc7de73c46c7f3609a4

parents c8ab2a70 30b390cb

services/surfaceflinger/SurfaceFlinger.cpp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2980,7 +2980,10 @@ uint32_t SurfaceFlinger::setClientStateLocked(
	}		}
	}		}
	if (what & layer_state_t::eRelativeLayerChanged) {		if (what & layer_state_t::eRelativeLayerChanged) {
			ssize_t idx = mCurrentState.layersSortedByZ.indexOf(layer);
	if (layer->setRelativeLayer(s.relativeLayerHandle, s.z)) {		if (layer->setRelativeLayer(s.relativeLayerHandle, s.z)) {
			mCurrentState.layersSortedByZ.removeAt(idx);
			mCurrentState.layersSortedByZ.add(layer);
	flags \|= eTransactionNeeded\|eTraversalNeeded;		flags \|= eTransactionNeeded\|eTraversalNeeded;
	}		}
	}		}

services/surfaceflinger/SurfaceFlinger_hwc1.cpp

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2576,6 +2576,14 @@ uint32_t SurfaceFlinger::setClientStateLocked(
	}		}
	}		}
	}		}
			if (what & layer_state_t::eRelativeLayerChanged) {
			ssize_t idx = mCurrentState.layersSortedByZ.indexOf(layer);
			if (layer->setRelativeLayer(s.relativeLayerHandle, s.z)) {
			mCurrentState.layersSortedByZ.removeAt(idx);
			mCurrentState.layersSortedByZ.add(layer);
			flags \|= eTransactionNeeded\|eTraversalNeeded;
			}
			}
	if (what & layer_state_t::eSizeChanged) {		if (what & layer_state_t::eSizeChanged) {
	if (layer->setSize(s.w, s.h)) {		if (layer->setSize(s.w, s.h)) {
	flags \|= eTraversalNeeded;		flags \|= eTraversalNeeded;