Merge "DO NOT MERGE - Merge RQ1A.201205.011" into stage-aosp-master (23526561) · Commits · e / os / android_frameworks_native-old

services/surfaceflinger/SurfaceFlinger.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -6228,6 +6228,11 @@ status_t SurfaceFlinger::setFrameRate(const sp<IGraphicBufferProducer>& surface,
		Mutex::Autolock lock(mStateLock);
		if (authenticateSurfaceTextureLocked(surface)) {
		sp<Layer> layer = (static_cast<MonitoredProducer*>(surface.get()))->getLayer();
		if (layer == nullptr) {
		ALOGE("Attempt to set frame rate on a layer that no longer exists");
		return BAD_VALUE;
		}

		if (layer->setFrameRate(
		Layer::FrameRate(frameRate,
		Layer::FrameRate::convertCompatibility(compatibility)))) {