summaryrefslogtreecommitdiff
path: root/libs/gui/SurfaceComposerClient.cpp
diff options
context:
space:
mode:
author Andy McFadden <fadden@android.com> 2014-02-18 23:59:43 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-02-18 23:59:43 +0000
commit22a5c8b2e3c232a7cbe452759f20fc3c8382add7 (patch)
treef3ef83eeb805f53309c743101d1896aff928fd55 /libs/gui/SurfaceComposerClient.cpp
parent7a66f7afd1b6a975ab3b99b4765781a0d66958c8 (diff)
parent44c35ec4a94eb33f7ee0df085c5d2d56d99962cf (diff)
am 44c35ec4: Allow "opaque" flag to be updated. DO NOT MERGE
* commit '44c35ec4a94eb33f7ee0df085c5d2d56d99962cf': Allow "opaque" flag to be updated. DO NOT MERGE
Diffstat (limited to 'libs/gui/SurfaceComposerClient.cpp')
-rw-r--r--libs/gui/SurfaceComposerClient.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index aafc4d255f..2246f5f9bb 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -309,7 +309,12 @@ status_t Composer::setFlags(const sp<SurfaceComposerClient>& client,
layer_state_t* s = getLayerStateLocked(client, id);
if (!s)
return BAD_INDEX;
- s->what |= layer_state_t::eVisibilityChanged;
+ if (mask & layer_state_t::eLayerOpaque) {
+ s->what |= layer_state_t::eOpacityChanged;
+ }
+ if (mask & layer_state_t::eLayerHidden) {
+ s->what |= layer_state_t::eVisibilityChanged;
+ }
s->flags &= ~mask;
s->flags |= (flags & mask);
s->mask |= mask;