From bbb57f3331c7182399ed82e9c4f93a965677dde3 Mon Sep 17 00:00:00 2001
From: Dave Burke <daveburke@google.com>
Date: Fri, 1 Mar 2013 20:39:03 +0000
Subject: [PATCH] Revert "Change SurfaceControl setPosition to take floats"

Temporary, to fix weekend build, until we get Nvidia code drop.

This reverts commit 9a867a8798fa6ea21f6341db31e38ea64fde6c83

DO NOT MERGE

Change-Id: I7b5dbc4db46ef3d97dc8598057d5487d6971178b
---
 include/gui/SurfaceControl.h | 2 +-
 libs/gui/SurfaceControl.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/gui/SurfaceControl.h b/include/gui/SurfaceControl.h
index 9268e7dc8..f70888ddf 100644
--- a/include/gui/SurfaceControl.h
+++ b/include/gui/SurfaceControl.h
@@ -57,7 +57,7 @@ public:
     
     status_t    setLayerStack(int32_t layerStack);
     status_t    setLayer(int32_t layer);
-    status_t    setPosition(float x, float y);
+    status_t    setPosition(int32_t x, int32_t y);
     status_t    setSize(uint32_t w, uint32_t h);
     status_t    hide();
     status_t    show();
diff --git a/libs/gui/SurfaceControl.cpp b/libs/gui/SurfaceControl.cpp
index e621b22a0..ef52269b0 100644
--- a/libs/gui/SurfaceControl.cpp
+++ b/libs/gui/SurfaceControl.cpp
@@ -106,7 +106,7 @@ status_t SurfaceControl::setLayer(int32_t layer) {
     const sp<SurfaceComposerClient>& client(mClient);
     return client->setLayer(mSurface, layer);
 }
-status_t SurfaceControl::setPosition(float x, float y) {
+status_t SurfaceControl::setPosition(int32_t x, int32_t y) {
     status_t err = validate();
     if (err < 0) return err;
     const sp<SurfaceComposerClient>& client(mClient);