fix [3369743] SurfaceFlinger reads hardware composer hints before calling hwc.prepare() (45491690) · Commits · e / os / android_frameworks_base

services/surfaceflinger/SurfaceFlinger.cpp

+26 −20

Original line number	Original line	Diff line number	Diff line
	@@ -872,15 +872,19 @@ void SurfaceFlinger::composeSurfaces(const Region& dirty)
	for (size_t i=0 ; i<count ; i++) {		for (size_t i=0 ; i<count ; i++) {
	const sp<LayerBase>& layer(layers[i]);		const sp<LayerBase>& layer(layers[i]);
	layer->setPerFrameData(&cur[i]);		layer->setPerFrameData(&cur[i]);
			}
			err = hwc.prepare();
			LOGE_IF(err, "HWComposer::prepare failed (%s)", strerror(-err));

			if (err == NO_ERROR) {
			for (size_t i=0 ; i<count ; i++) {
	if (cur[i].hints & HWC_HINT_CLEAR_FB) {		if (cur[i].hints & HWC_HINT_CLEAR_FB) {
			const sp<LayerBase>& layer(layers[i]);
	if (!(layer->needsBlending())) {		if (!(layer->needsBlending())) {
	transparent.orSelf(layer->visibleRegionScreen);		transparent.orSelf(layer->visibleRegionScreen);
	}		}
	}		}
	}		}
	err = hwc.prepare();
	LOGE_IF(err, "HWComposer::prepare failed (%s)", strerror(-err));
	}

	/*		/*
	* clear the area of the FB that need to be transparent		* clear the area of the FB that need to be transparent
	@@ -898,6 +902,8 @@ void SurfaceFlinger::composeSurfaces(const Region& dirty)
	glClear(GL_COLOR_BUFFER_BIT);		glClear(GL_COLOR_BUFFER_BIT);
	}		}
	}		}
			}
			}


	/*		/*