From: Jean-Baptiste Queru <jbq@google.com>
Date: Sat, 18 Jun 2011 16:42:04 +0000 (-0700)
Subject: Tweaks for forward-compatibility
X-Git-Tag: android-x86-4.4-r1~3915^2~2^2~50^2~2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3f3f5af40e409fe5d2f2af2c4906dbb28a982f43;p=android-x86%2Fframeworks-native.git

Tweaks for forward-compatibility

Change-Id: Iec525edc186e78d5d865f82dd5b1f56263c22e86
---

diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h
index 255afdd3cd..f5f9ea7148 100644
--- a/include/gui/SurfaceTexture.h
+++ b/include/gui/SurfaceTexture.h
@@ -28,6 +28,7 @@ struct SurfaceTexture {
     void incStrong(android::sp<android::SurfaceTexture>* const) {}
     void getTransformMatrix(float mtx[16]) {}
     void setFrameAvailableListener(const sp<FrameAvailableListener>&) {}
+    void setSynchronousMode(bool) {}
 };
 
 static sp<SurfaceTexture> SurfaceTexture_getSurfaceTexture(JNIEnv* env, jobject thiz)
diff --git a/include/ui/GraphicBuffer.h b/include/ui/GraphicBuffer.h
index 0be26a79a7..1da9729d40 100644
--- a/include/ui/GraphicBuffer.h
+++ b/include/ui/GraphicBuffer.h
@@ -74,6 +74,8 @@ public:
 
     GraphicBuffer();
 
+    GraphicBuffer(android_native_buffer_t*, bool);
+
     // creates w * h buffer
     GraphicBuffer(uint32_t w, uint32_t h, PixelFormat format, uint32_t usage);
 
diff --git a/include/ui/android_native_buffer.h b/include/ui/android_native_buffer.h
index a472824bc5..85a1638aad 100644
--- a/include/ui/android_native_buffer.h
+++ b/include/ui/android_native_buffer.h
@@ -63,6 +63,7 @@ typedef struct android_native_buffer_t
     void* reserved_proc[8];
 } android_native_buffer_t;
 
+#define ANativeWindowBuffer android_native_buffer_t
 
 /*****************************************************************************/
 
diff --git a/libs/ui/GraphicBuffer.cpp b/libs/ui/GraphicBuffer.cpp
index 3671954397..d9efeab4bf 100644
--- a/libs/ui/GraphicBuffer.cpp
+++ b/libs/ui/GraphicBuffer.cpp
@@ -49,6 +49,19 @@ GraphicBuffer::GraphicBuffer()
     handle = NULL;
 }
 
+GraphicBuffer::GraphicBuffer(android_native_buffer_t*, bool)
+    : BASE(), mOwner(ownData), mBufferMapper(GraphicBufferMapper::get()),
+      mInitCheck(NO_ERROR), mIndex(-1)
+{
+    width  = 
+    height = 
+    stride = 
+    format = 
+    usage  = 0;
+    transform = 0;
+    handle = NULL;
+}
+
 GraphicBuffer::GraphicBuffer(uint32_t w, uint32_t h, 
         PixelFormat reqFormat, uint32_t reqUsage)
     : BASE(), mOwner(ownData), mBufferMapper(GraphicBufferMapper::get()),