Snap for 5633820 from 383ad33993efa06f7c8d0391522fb5010c8d4d65 to qt-qpr1-release (b7da19f1) · Commits · e / os / android_frameworks_native

services/surfaceflinger/Layer.cpp

+26 −13

Original line number	Diff line number	Diff line
		@@ -158,18 +158,26 @@ void Layer::removeRemoteSyncPoints() {
		}
		}

		void Layer::onRemovedFromCurrentState() {
		mRemovedFromCurrentState = true;
		void Layer::removeRelativeZ(const std::vector<Layer*>& layersInTree) {
		if (mCurrentState.zOrderRelativeOf == nullptr) {
		return;
		}

		// the layer is removed from SF mCurrentState to mLayersPendingRemoval
		if (mCurrentState.zOrderRelativeOf != nullptr) {
		sp<Layer> strongRelative = mCurrentState.zOrderRelativeOf.promote();
		if (strongRelative != nullptr) {
		if (strongRelative == nullptr) {
		setZOrderRelativeOf(nullptr);
		return;
		}

		if (!std::binary_search(layersInTree.begin(), layersInTree.end(), strongRelative.get())) {
		strongRelative->removeZOrderRelative(this);
		mFlinger->setTransactionFlags(eTraversalNeeded);
		}
		setZOrderRelativeOf(nullptr);
		}
		}

		void Layer::removeFromCurrentState() {
		mRemovedFromCurrentState = true;

		// Since we are no longer reachable from CurrentState SurfaceFlinger
		// will no longer invoke doTransaction for us, and so we will
		@@ -186,11 +194,16 @@ void Layer::onRemovedFromCurrentState() {
		mLocalSyncPoints.clear();
		}

		for (const auto& child : mCurrentChildren) {
		child->onRemovedFromCurrentState();
		mFlinger->markLayerPendingRemovalLocked(this);
		}

		mFlinger->markLayerPendingRemovalLocked(this);
		void Layer::onRemovedFromCurrentState() {
		auto layersInTree = getLayersInTree(LayerVector::StateSet::Current);
		std::sort(layersInTree.begin(), layersInTree.end());
		for (const auto& layer : layersInTree) {
		layer->removeFromCurrentState();
		layer->removeRelativeZ(layersInTree);
		}
		}

		void Layer::addToCurrentState() {

services/surfaceflinger/Layer.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -570,6 +570,17 @@ public:

		virtual bool isBufferLatched() const { return false; }

		/*
		* Remove relative z for the layer if its relative parent is not part of the
		* provided layer tree.
		*/
		void removeRelativeZ(const std::vector<Layer*>& layersInTree);

		/*
		* Remove from current state and mark for removal.
		*/
		void removeFromCurrentState();

		/*
		* called with the state lock from a binder thread when the layer is
		* removed from the current list to the pending removal list

services/surfaceflinger/SurfaceFlinger.cpp

+23 −3

Original line number	Diff line number	Diff line
		@@ -1530,10 +1530,25 @@ void SurfaceFlinger::onRefreshReceived(int sequenceId, hwc2_display_t /*hwcDispl

		void SurfaceFlinger::setPrimaryVsyncEnabled(bool enabled) {
		ATRACE_CALL();
		Mutex::Autolock lock(mStateLock);

		// Enable / Disable HWVsync from the main thread to avoid race conditions with
		// display power state.
		postMessageAsync(new LambdaMessage(
		[=]() NO_THREAD_SAFETY_ANALYSIS { setPrimaryVsyncEnabledInternal(enabled); }));
		}

		void SurfaceFlinger::setPrimaryVsyncEnabledInternal(bool enabled) {
		ATRACE_CALL();

		if (const auto displayId = getInternalDisplayIdLocked()) {
		sp<DisplayDevice> display = getDefaultDisplayDeviceLocked();
		if (display && display->isPoweredOn()) {
		getHwComposer().setVsyncEnabled(*displayId,
		enabled ? HWC2::Vsync::Enable : HWC2::Vsync::Disable);
		} else {
		// Cache the latest vsync state and apply it when screen is on again
		mEnableHWVsyncScreenOn = enabled;
		}
		}
		}

		@@ -4431,6 +4446,11 @@ void SurfaceFlinger::setPowerModeInternal(const sp<DisplayDevice>& display, int
		// Turn on the display
		getHwComposer().setPowerMode(*displayId, mode);
		if (display->isPrimary() && mode != HWC_POWER_MODE_DOZE_SUSPEND) {
		if (mEnableHWVsyncScreenOn) {
		setPrimaryVsyncEnabledInternal(mEnableHWVsyncScreenOn);
		mEnableHWVsyncScreenOn = false;
		}

		mScheduler->onScreenAcquired(mAppConnectionHandle);
		mScheduler->resyncToHardwareVsync(true, getVsyncPeriod());
		}

services/surfaceflinger/SurfaceFlinger.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -293,6 +293,9 @@ public:
		// TODO: this should be made accessible only to EventThread
		void setPrimaryVsyncEnabled(bool enabled);

		// main thread function to enable/disable h/w composer event
		void setPrimaryVsyncEnabledInternal(bool enabled);

		// called on the main thread by MessageQueue when an internal message
		// is received
		// TODO: this should be made accessible only to MessageQueue
		@@ -1168,6 +1171,9 @@ private:
		// The Layer pointer is removed from the set when the destructor is called so there shouldn't
		// be any issues with a raw pointer referencing an invalid object.
		std::unordered_set<Layer*> mOffscreenLayers;

		// Flag to indicate whether to re-enable HWVsync when screen is on
		bool mEnableHWVsyncScreenOn = false;
		};

		} // namespace android

services/surfaceflinger/tests/SurfaceFlinger_test.filter

+1 −1

Original line number	Diff line number	Diff line
		{
		"presubmit": {
		"filter": "CredentialsTest.:SurfaceFlingerStress.:SurfaceInterceptorTest.:LayerTransactionTest.:LayerTypeTransactionTest.:LayerUpdateTest.:GeometryLatchingTest.:CropLatchingTest.:ChildLayerTest.:ScreenCaptureTest.:ScreenCaptureChildOnlyTest.:DereferenceSurfaceControlTest.:BoundlessLayerTest.:MultiDisplayLayerBoundsTest.:InvalidHandleTest.:VirtualDisplayTest."
		"filter": "CredentialsTest.:SurfaceFlingerStress.:SurfaceInterceptorTest.:LayerTransactionTest.:LayerTypeTransactionTest.:LayerUpdateTest.:GeometryLatchingTest.:CropLatchingTest.:ChildLayerTest.:ScreenCaptureTest.:ScreenCaptureChildOnlyTest.:DereferenceSurfaceControlTest.:BoundlessLayerTest.:MultiDisplayLayerBoundsTest.:InvalidHandleTest.:VirtualDisplayTest.:RelativeZTest.*"
		}
		}