From b17ee7fe4c94523810462858c7417f38f3ba0bcd Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Tue, 2 Aug 2011 18:29:51 -0700 Subject: fix a crasher in surfaceflinger this would happen if being told to draw before a buffer was available. Change-Id: I46d121c73e883078cdbf952063e38b0076f79038 --- services/surfaceflinger/Layer.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'services') diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 32f300f..383c045 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -227,8 +227,13 @@ void Layer::setPerFrameData(hwc_layer_t* hwcl) { } else { hwcl->sourceCrop.left = 0; hwcl->sourceCrop.top = 0; - hwcl->sourceCrop.right = buffer->width; - hwcl->sourceCrop.bottom = buffer->height; + if (buffer != NULL) { + hwcl->sourceCrop.right = buffer->width; + hwcl->sourceCrop.bottom = buffer->height; + } else { + hwcl->sourceCrop.right = mTransformedBounds.width(); + hwcl->sourceCrop.bottom = mTransformedBounds.height(); + } } } -- cgit v1.1