get rid of android_native_buffer_t::getHandle() and replace it with an handle field

this abstraction was not necessary. things are easier now.

2 files changed, 0 insertions, 15 deletions

diff --git a/include/ui/FramebufferNativeWindow.h b/include/ui/FramebufferNativeWindow.h
index 4b281db..0db245a 100644
--- a/include/ui/FramebufferNativeWindow.h
+++ b/include/ui/FramebufferNativeWindow.h
@@ -50,17 +50,10 @@ public:
         android_native_buffer_t::height = h;
         android_native_buffer_t::format = f;
         android_native_buffer_t::usage  = u;
-        android_native_buffer_t::getHandle = getHandle;
     }
-public:
-    buffer_handle_t handle;
 private:
     friend class LightRefBase<NativeBuffer>;    
     ~NativeBuffer() { }; // this class cannot be overloaded
-    static int getHandle(android_native_buffer_t const * base, buffer_handle_t* handle) {
-        *handle = getSelf(base)->handle;
-        return 0;
-    }
 };
 
 // ---------------------------------------------------------------------------
diff --git a/include/ui/Surface.h b/include/ui/Surface.h
index ce50719..e9bb1b3 100644
--- a/include/ui/Surface.h
+++ b/include/ui/Surface.h
@@ -50,10 +50,6 @@ class SurfaceBuffer
         LightRefBase<SurfaceBuffer> >
 {
 public:
-    buffer_handle_t getHandle() const {
-        return handle;
-    }
-    
     status_t lock(uint32_t usage, void** vaddr);
     status_t lock(uint32_t usage, const Rect& rect, void** vaddr);
     status_t unlock();
@@ -62,7 +58,6 @@ protected:
             SurfaceBuffer();
             SurfaceBuffer(const Parcel& reply);
     virtual ~SurfaceBuffer();
-    buffer_handle_t handle;
     bool mOwner;
 
     inline const BufferMapper& getBufferMapper() const { return mBufferMapper; }
@@ -80,9 +75,6 @@ private:
     static status_t writeToParcel(Parcel* reply, 
             android_native_buffer_t const* buffer);
     
-    static int getHandle(android_native_buffer_t const * base, 
-            buffer_handle_t* handle);
-    
     BufferMapper& mBufferMapper;
 };