summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2011-11-21 17:57:47 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-21 17:57:47 -0800
commit33ad559edc1376d2596f291dba1dc0e8f2840d79 (patch)
tree4eaa4f97ead53183af960a671efcecd02a70369c
parent05a93054a3f676292b6c8f445b1bf0f18c03ca42 (diff)
parent2b64f698e72e838b5a14d0c826a866aafd5db179 (diff)
downloadcrespo-33ad559edc1376d2596f291dba1dc0e8f2840d79.tar.gz
Merge "don't return an error when SF turns the screen off" into ics-mr1
-rw-r--r--libhwcomposer/SecHWC.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/libhwcomposer/SecHWC.cpp b/libhwcomposer/SecHWC.cpp
index c9970a1..31c0b2c 100644
--- a/libhwcomposer/SecHWC.cpp
+++ b/libhwcomposer/SecHWC.cpp
@@ -293,6 +293,13 @@ static int hwc_set(hwc_composer_device_t *dev,
struct sec_rect dst_rect;
+ if (dpy == NULL && sur == NULL && list == NULL) {
+ // release our resources, the screen is turning off
+ // in our case, there is nothing to do.
+ ctx->num_of_fb_layer_prev = 0;
+ return 0;
+ }
+
bool need_swap_buffers = ctx->num_of_fb_layer > 0;
/*