summaryrefslogtreecommitdiff
path: root/libs/gui/SurfaceControl.cpp
diff options
context:
space:
mode:
author Ramanan Rajeswaran <ramanan@google.com> 2013-03-21 15:52:48 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2013-03-21 15:52:49 +0000
commitac006439bb635cd99d8dcbefe95fa680e21519b5 (patch)
tree9a26cdd156e4440664508f0a3fc20f797d988399 /libs/gui/SurfaceControl.cpp
parent7c1a487ba8c0a3b591a77e2ddcb33ef9bdfaff64 (diff)
parentd6480c020b050c777ec1db2dd9c16fccfc47b47b (diff)
Merge "Revert "Revert "Change SurfaceControl setPosition to take floats""" into jb-mr2-dev
Diffstat (limited to 'libs/gui/SurfaceControl.cpp')
-rw-r--r--libs/gui/SurfaceControl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/gui/SurfaceControl.cpp b/libs/gui/SurfaceControl.cpp
index bb57948d50..f4e88f5db8 100644
--- a/libs/gui/SurfaceControl.cpp
+++ b/libs/gui/SurfaceControl.cpp
@@ -102,7 +102,7 @@ status_t SurfaceControl::setLayer(int32_t layer) {
const sp<SurfaceComposerClient>& client(mClient);
return client->setLayer(mHandle, layer);
}
-status_t SurfaceControl::setPosition(int32_t x, int32_t y) {
+status_t SurfaceControl::setPosition(float x, float y) {
status_t err = validate();
if (err < 0) return err;
const sp<SurfaceComposerClient>& client(mClient);