Merge "Get rid of logic that clears sync point when layer is hidden" (a122a649) · Commits · e / os / android_frameworks_native-old

services/surfaceflinger/Layer.cpp

+0 −19

Original line number	Diff line number	Diff line
		@@ -1071,13 +1071,6 @@ uint32_t Layer::doTransaction(uint32_t flags) {
		mNeedsFiltering = (!getActiveTransform(c).preserveRects() \|\| type >= ui::Transform::SCALE);
		}

		// If the layer is hidden, signal and clear out all local sync points so
		// that transactions for layers depending on this layer's frames becoming
		// visible are not blocked
		if (c.flags & layer_state_t::eLayerHidden) {
		clearSyncPoints();
		}

		if (mCurrentState.inputInfoChanged) {
		flags \|= eInputInfoChanged;
		mCurrentState.inputInfoChanged = false;
		@@ -1771,18 +1764,6 @@ void Layer::setParent(const sp<Layer>& layer) {
		mCurrentParent = layer;
		}

		void Layer::clearSyncPoints() {
		for (const auto& child : mCurrentChildren) {
		child->clearSyncPoints();
		}

		Mutex::Autolock lock(mLocalSyncPointMutex);
		for (auto& point : mLocalSyncPoints) {
		point->setFrameAvailable();
		}
		mLocalSyncPoints.clear();
		}

		int32_t Layer::getZ() const {
		return mDrawingState.z;
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -750,8 +750,6 @@ protected:
		virtual bool applyPendingStates(State* stateToCommit);
		virtual uint32_t doTransactionResize(uint32_t flags, Layer::State* stateToCommit);

		void clearSyncPoints();

		// Returns mCurrentScaling mode (originating from the
		// Client) or mOverrideScalingMode mode (originating from
		// the Surface Controller) if set.