summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2011-11-21 21:08:46 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-21 21:08:46 -0800
commit536345b6a234c289183feb0483c32a8ef9eacdbf (patch)
treee8f7e5e3c2466b527d6e1e277ecac31490383f1a
parente7f908e9739922f38d2fd2715efdb7a3d0def232 (diff)
parent33ad559edc1376d2596f291dba1dc0e8f2840d79 (diff)
downloaddevice_samsung_crespo-536345b6a234c289183feb0483c32a8ef9eacdbf.zip
device_samsung_crespo-536345b6a234c289183feb0483c32a8ef9eacdbf.tar.gz
device_samsung_crespo-536345b6a234c289183feb0483c32a8ef9eacdbf.tar.bz2
am 33ad559e: Merge "don\'t return an error when SF turns the screen off" into ics-mr1
* commit '33ad559edc1376d2596f291dba1dc0e8f2840d79': don't return an error when SF turns the screen off
-rw-r--r--libhwcomposer/SecHWC.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/libhwcomposer/SecHWC.cpp b/libhwcomposer/SecHWC.cpp
index ef2b531..cd15de0 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;
/*