summaryrefslogtreecommitdiff
path: root/libs/gui/SurfaceComposerClient.cpp
diff options
context:
space:
mode:
author Jeff Brown <jeffbrown@google.com> 2012-08-27 17:17:08 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2012-08-27 17:17:09 -0700
commit1ae49e3fef34ee38f8dfeb08b5914e3362af3b2f (patch)
tree61e54572966f9d19e8350d3441d9d59e235eff3d /libs/gui/SurfaceComposerClient.cpp
parente310c3949f7de7183ef43e751526a5dc4cf0d74c (diff)
parent380223bf1b340e7503177254a60d5982f95ab793 (diff)
Merge "Remove unused "layer" argument from show()." into jb-mr1-dev
Diffstat (limited to 'libs/gui/SurfaceComposerClient.cpp')
-rw-r--r--libs/gui/SurfaceComposerClient.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index 1b81e45da7..d55d42e9b4 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -479,7 +479,7 @@ status_t SurfaceComposerClient::hide(SurfaceID id) {
layer_state_t::eLayerHidden);
}
-status_t SurfaceComposerClient::show(SurfaceID id, int32_t) {
+status_t SurfaceComposerClient::show(SurfaceID id) {
return getComposer().setFlags(this, id,
0,
layer_state_t::eLayerHidden);