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

Commit 3356367c authored Apr 20, 2022 by Dominik Laskowski Committed by Android (Google) Code Review Apr 20, 2022

Merge changes from topics "presubmit-am-55f310f6061a4fdfa7811f47f62b8b5c",...

Merge changes from topics "presubmit-am-55f310f6061a4fdfa7811f47f62b8b5c", "presubmit-am-f6a0ce426c734db58ba765fa00f5f38c" into tm-dev

* changes:
  SF: Add dumpsys flags to dump displays
  SF: Clean up display lookup

parents c8c33325 0acc384b

libs/ui/DeviceProductInfo.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -57,7 +57,7 @@ status_t DeviceProductInfo::unflatten(void const* buffer, size_t size) {
	}		}

	void DeviceProductInfo::dump(std::string& result) const {		void DeviceProductInfo::dump(std::string& result) const {
	StringAppendF(&result, "{name=%s, ", name.c_str());		StringAppendF(&result, "{name=\"%s\", ", name.c_str());
	StringAppendF(&result, "manufacturerPnpId=%s, ", manufacturerPnpId.data());		StringAppendF(&result, "manufacturerPnpId=%s, ", manufacturerPnpId.data());
	StringAppendF(&result, "productId=%s, ", productId.c_str());		StringAppendF(&result, "productId=%s, ", productId.c_str());

services/surfaceflinger/CompositionEngine/include/compositionengine/ProjectionSpace.h

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -120,15 +120,15 @@ private:

	} // namespace compositionengine		} // namespace compositionengine

	inline std::string to_string(const android::compositionengine::ProjectionSpace& space) {		inline std::string to_string(const compositionengine::ProjectionSpace& space) {
	return android::base::		return base::StringPrintf("ProjectionSpace{bounds=%s, content=%s, orientation=%s}",
	StringPrintf("ProjectionSpace(bounds = %s, content = %s, orientation = %s)",
	to_string(space.getBoundsAsRect()).c_str(),		to_string(space.getBoundsAsRect()).c_str(),
	to_string(space.getContent()).c_str(), toCString(space.getOrientation()));		to_string(space.getContent()).c_str(),
			toCString(space.getOrientation()));
	}		}

	// Defining PrintTo helps with Google Tests.		// Defining PrintTo helps with Google Tests.
	inline void PrintTo(const android::compositionengine::ProjectionSpace& space, ::std::ostream* os) {		inline void PrintTo(const compositionengine::ProjectionSpace& space, std::ostream* os) {
	*os << to_string(space);		*os << to_string(space);
	}		}

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/OutputCompositionState.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -155,6 +155,8 @@ struct OutputCompositionState {
	SUCCESS = 1,		SUCCESS = 1,
	// Composition strategy prediction failed for this frame.		// Composition strategy prediction failed for this frame.
	FAIL = 2,		FAIL = 2,

			ftl_last = FAIL
	};		};

	CompositionStrategyPredictionState strategyPrediction =		CompositionStrategyPredictionState strategyPrediction =

services/surfaceflinger/CompositionEngine/src/Display.cpp

+4 −8

Original line number	Original line	Diff line number	Diff line
	@@ -131,15 +131,11 @@ void Display::setColorProfile(const ColorProfile& colorProfile) {
	}		}

	void Display::dump(std::string& out) const {		void Display::dump(std::string& out) const {
	using android::base::StringAppendF;		const char* const type = isVirtual() ? "virtual" : "physical";
			base::StringAppendF(&out, "Display %s (%s, \"%s\")", to_string(mId).c_str(), type,
	StringAppendF(&out, " Composition Display State: [\"%s\"]", getName().c_str());		getName().c_str());

	out.append("\n ");
	dumpVal(out, "isVirtual", isVirtual());
	dumpVal(out, "DisplayId", to_string(mId));
	out.append("\n");

			out.append("\n Composition Display State:\n");
	Output::dumpBase(out);		Output::dumpBase(out);
	}		}

services/surfaceflinger/CompositionEngine/src/DumpHelpers.cpp

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -89,7 +89,6 @@ void dumpVal(std::string& out, const char* name, const Region& region) {

	void dumpVal(std::string& out, const char* name, const ui::Transform& transform) {		void dumpVal(std::string& out, const char* name, const ui::Transform& transform) {
	transform.dump(out, name);		transform.dump(out, name);
	out.append(" ");
	}		}

	void dumpVal(std::string& out, const char* name, const mat4& tr) {		void dumpVal(std::string& out, const char* name, const mat4& tr) {
	@@ -109,9 +108,9 @@ void dumpVal(std::string& out, const char* name, const mat4& tr) {
	}		}

	void dumpVal(std::string& out, const char* name, const StretchEffect& effect) {		void dumpVal(std::string& out, const char* name, const StretchEffect& effect) {
	StringAppendF(&out, "%s={ width =%f, height = %f, vec=(%f, %f), max=(%f, %f) } ", name,		StringAppendF(&out, "%s={width=%f, height=%f, vec=(%f, %f), max=(%f, %f)} ", name, effect.width,
	effect.width, effect.height,		effect.height, effect.vectorX, effect.vectorY, effect.maxAmountX,
	effect.vectorX, effect.vectorY, effect.maxAmountX, effect.maxAmountY);		effect.maxAmountY);
	}		}

	} // namespace android::compositionengine::impl		} // namespace android::compositionengine::impl