commit e9a8c1c0d525d49d934c901f965d84fa89cbef80
author Brad Fitzpatrick <bradfitz@android.com> Thu Mar 25 21:02:46 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 25 21:02:46 2010 -0700
tree 507fa33c1d3a353f262bffab553397d27bbfdd5e
parent 3791f200827267a03400a711eea741e48b76fda1
parent 45ccabbc26dac97b200c5ac4e86f792afebb643e

Merge "Clarify some Binder docs regarding things that are thread-local."

include/ui/GraphicBufferAllocator.h

diff --git a/include/ui/GraphicBufferAllocator.h b/include/ui/GraphicBufferAllocator.h
index be9c79b..741d763 100644
--- a/include/ui/GraphicBufferAllocator.h
+++ b/include/ui/GraphicBufferAllocator.h
@@ -86,7 +86,6 @@
     GraphicBufferAllocator();
     ~GraphicBufferAllocator();
     
-    mutable Mutex mLock;
     alloc_device_t  *mAllocDev;
 };
 

libs/ui/GraphicBufferAllocator.cpp

diff --git a/libs/ui/GraphicBufferAllocator.cpp b/libs/ui/GraphicBufferAllocator.cpp
index 57d5fc3..6ae7e74 100644
--- a/libs/ui/GraphicBufferAllocator.cpp
+++ b/libs/ui/GraphicBufferAllocator.cpp
@@ -78,8 +78,6 @@
 status_t GraphicBufferAllocator::alloc(uint32_t w, uint32_t h, PixelFormat format,
         int usage, buffer_handle_t* handle, int32_t* stride)
 {
-    Mutex::Autolock _l(mLock);
-
     // make sure to not allocate a 0 x 0 buffer
     w = clamp(w);
     h = clamp(h);
@@ -118,8 +116,6 @@
 
 status_t GraphicBufferAllocator::free(buffer_handle_t handle)
 {
-    Mutex::Autolock _l(mLock);
-
     status_t err;
     if (sw_gralloc_handle_t::validate(handle) < 0) {
         err = mAllocDev->free(mAllocDev, handle);

opengl/libagl/state.cpp

diff --git a/opengl/libagl/state.cpp b/opengl/libagl/state.cpp
index 1224a96..27bb545 100644
--- a/opengl/libagl/state.cpp
+++ b/opengl/libagl/state.cpp
@@ -37,7 +37,7 @@
 // ----------------------------------------------------------------------------
 
 static char const * const gVendorString     = "Android";
-static char const * const gRendererString   = "Android PixelFlinger 1.2";
+static char const * const gRendererString   = "Android PixelFlinger 1.3";
 static char const * const gVersionString    = "OpenGL ES-CM 1.0";
 static char const * const gExtensionsString =
     "GL_OES_byte_coordinates "              // OK