Merge "Fix typo ("reachablilty" -> "reachability")" into main (cb8b75ab) · Commits · e / os / android_frameworks_native

services/surfaceflinger/FrontEnd/LayerSnapshot.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -134,7 +134,7 @@ LayerSnapshot::LayerSnapshot(const RequestedLayerState& state,
		clientChanges = 0;
		mirrorRootPath =
		LayerHierarchy::isMirror(path.variant) ? path : LayerHierarchy::TraversalPath::ROOT;
		reachablilty = LayerSnapshot::Reachablilty::Unreachable;
		reachability = LayerSnapshot::Reachability::Unreachable;
		frameRateSelectionPriority = state.frameRateSelectionPriority;
		layerMetadata = state.metadata;
		}
		@@ -223,7 +223,7 @@ bool LayerSnapshot::isHiddenByPolicy() const {
		}

		bool LayerSnapshot::getIsVisible() const {
		if (reachablilty != LayerSnapshot::Reachablilty::Reachable) {
		if (reachability != LayerSnapshot::Reachability::Reachable) {
		return false;
		}

		@@ -244,9 +244,9 @@ bool LayerSnapshot::getIsVisible() const {

		std::string LayerSnapshot::getIsVisibleReason() const {
		// not visible
		if (reachablilty == LayerSnapshot::Reachablilty::Unreachable)
		if (reachability == LayerSnapshot::Reachability::Unreachable)
		return "layer not reachable from root";
		if (reachablilty == LayerSnapshot::Reachablilty::ReachableByRelativeParent)
		if (reachability == LayerSnapshot::Reachability::ReachableByRelativeParent)
		return "layer only reachable via relative parent";
		if (isHiddenByPolicyFromParent) return "hidden by parent or layer flag";
		if (isHiddenByPolicyFromRelativeParent) return "hidden by relative parent";
		@@ -283,7 +283,7 @@ bool LayerSnapshot::isTransformValid(const ui::Transform& t) {
		bool LayerSnapshot::hasInputInfo() const {
		return (inputInfo.token != nullptr \|\|
		inputInfo.inputConfig.test(gui::WindowInfo::InputConfig::NO_INPUT_CHANNEL)) &&
		reachablilty == Reachablilty::Reachable;
		reachability == Reachability::Reachable;
		}

		std::string LayerSnapshot::getDebugString() const {

services/surfaceflinger/FrontEnd/LayerSnapshot.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@ struct LayerSnapshot : public compositionengine::LayerFECompositionState {
		uint32_t touchCropId;
		gui::Uid uid = gui::Uid::INVALID;
		gui::Pid pid = gui::Pid::INVALID;
		enum class Reachablilty : uint32_t {
		enum class Reachability : uint32_t {
		// Can traverse the hierarchy from a root node and reach this snapshot
		Reachable,
		// Cannot traverse the hierarchy from a root node and reach this snapshot
		@@ -135,7 +135,7 @@ struct LayerSnapshot : public compositionengine::LayerFECompositionState {
		// and input.
		ReachableByRelativeParent
		};
		Reachablilty reachablilty;
		Reachability reachability;
		// True when the surfaceDamage is recognized as a small area update.
		bool isSmallDirty = false;

services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -438,8 +438,8 @@ void LayerSnapshotBuilder::updateSnapshots(const Args& args) {
		}

		for (auto& snapshot : mSnapshots) {
		if (snapshot->reachablilty == LayerSnapshot::Reachablilty::Reachable) {
		snapshot->reachablilty = LayerSnapshot::Reachablilty::Unreachable;
		if (snapshot->reachability == LayerSnapshot::Reachability::Reachable) {
		snapshot->reachability = LayerSnapshot::Reachability::Unreachable;
		}
		}

		@@ -480,7 +480,7 @@ void LayerSnapshotBuilder::updateSnapshots(const Args& args) {
		while (it < mSnapshots.end()) {
		auto& traversalPath = it->get()->path;
		const bool unreachable =
		it->get()->reachablilty == LayerSnapshot::Reachablilty::Unreachable;
		it->get()->reachability == LayerSnapshot::Reachability::Unreachable;
		const bool isClone = traversalPath.isClone();
		const bool layerIsDestroyed =
		destroyedLayerIds.find(traversalPath.id) != destroyedLayerIds.end();
		@@ -631,7 +631,7 @@ bool LayerSnapshotBuilder::sortSnapshotsByZ(const Args& args) {
		mSnapshots[globalZ]->globalZ = globalZ;
		/* mark unreachable snapshots as explicitly invisible */
		updateVisibility(*mSnapshots[globalZ], false);
		if (mSnapshots[globalZ]->reachablilty == LayerSnapshot::Reachablilty::Unreachable) {
		if (mSnapshots[globalZ]->reachability == LayerSnapshot::Reachability::Unreachable) {
		hasUnreachableSnapshots = true;
		}
		globalZ++;
		@@ -655,8 +655,8 @@ void LayerSnapshotBuilder::updateRelativeState(LayerSnapshot& snapshot,
		snapshot.relativeLayerMetadata = parentSnapshot.relativeLayerMetadata;
		}
		}
		if (snapshot.reachablilty == LayerSnapshot::Reachablilty::Unreachable) {
		snapshot.reachablilty = LayerSnapshot::Reachablilty::ReachableByRelativeParent;
		if (snapshot.reachability == LayerSnapshot::Reachability::Unreachable) {
		snapshot.reachability = LayerSnapshot::Reachability::ReachableByRelativeParent;
		}
		}

		@@ -730,7 +730,7 @@ void LayerSnapshotBuilder::updateSnapshot(LayerSnapshot& snapshot, const Args& a
		RequestedLayerState::Changes::FrameRate \| RequestedLayerState::Changes::GameMode);
		snapshot.changes \|= parentChanges;
		if (args.displayChanges) snapshot.changes \|= RequestedLayerState::Changes::Geometry;
		snapshot.reachablilty = LayerSnapshot::Reachablilty::Reachable;
		snapshot.reachability = LayerSnapshot::Reachability::Reachable;
		snapshot.clientChanges \|= (parentSnapshot.clientChanges & layer_state_t::AFFECTS_CHILDREN);
		// mark the content as dirty if the parent state changes can dirty the child's content (for
		// example alpha)