Merge "SF: Remove unused SurfaceFlinger::getLayerSortedByZForHwcDisplay" (dcd83fbd) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+0 −13

Original line number	Diff line number	Diff line
		@@ -4973,19 +4973,6 @@ void SurfaceFlinger::dumpAllLocked(const DumpArgs& args, std::string& result) co
		result.append("\n");
		}

		const Vector<sp<Layer>>& SurfaceFlinger::getLayerSortedByZForHwcDisplay(DisplayId displayId) {
		// Note: mStateLock is held here
		for (const auto& [token, display] : mDisplays) {
		if (display->getId() == displayId) {
		return getDisplayDeviceLocked(token)->getVisibleLayersSortedByZ();
		}
		}

		ALOGE("%s: Invalid display %s", __FUNCTION__, to_string(displayId).c_str());
		static const Vector<sp<Layer>> empty;
		return empty;
		}

		void SurfaceFlinger::updateColorMatrixLocked() {
		mat4 colorMatrix;
		if (mGlobalSaturationFactor != 1.0f) {

+0 −4

Original line number	Diff line number	Diff line
		@@ -305,10 +305,6 @@ public:
		// TODO: this should be made accessible only to MessageQueue
		void onMessageReceived(int32_t what);

		// for debugging only
		// TODO: this should be made accessible only to HWComposer
		const Vector<sp<Layer>>& getLayerSortedByZForHwcDisplay(DisplayId displayId);

		renderengine::RenderEngine& getRenderEngine() const;

		bool authenticateSurfaceTextureLocked(