commit 9f94e2cedc7db98028daefa1bf66dcbfc7f941d0
author Jason parks <jparks@google.com> Sat Jan 29 12:02:19 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jan 29 12:02:19 2011 -0800
tree 0838a9bd4e42d7d9fdf3637e442b53232e194336
parent 1fc7c8ff4bba4ae4f71dd46877563992ffc71332
parent 4613570b5123c3d76f1d99e0ca9042838de6394e

Merge "Update the encryption password when the device password is changed." into honeycomb

libs/gui/SurfaceTextureClient.cpp

diff --git a/libs/gui/SurfaceTextureClient.cpp b/libs/gui/SurfaceTextureClient.cpp
index 0ed8be5..c0e4e0f 100644
--- a/libs/gui/SurfaceTextureClient.cpp
+++ b/libs/gui/SurfaceTextureClient.cpp
@@ -88,7 +88,7 @@
     int buf = -1;
     status_t err = mSurfaceTexture->dequeueBuffer(&buf);
     if (err < 0) {
-        LOGE("dequeueBuffer: ISurfaceTexture::dequeueBuffer failed: %d", err);
+        LOGV("dequeueBuffer: ISurfaceTexture::dequeueBuffer failed: %d", err);
         return err;
     }
     sp<GraphicBuffer>& gbuf(mSlots[buf]);

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 3730739..f64fd7b 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -150,8 +150,7 @@
     // the layer is not on screen anymore. free as much resources as possible
     mFreezeLock.clear();
 
-    EGLDisplay dpy(mFlinger->graphicPlane(0).getEGLDisplay());
-    mBufferManager.destroy(dpy);
+    // Free our own reference to ISurface
     mSurface.clear();
 
     Mutex::Autolock _l(mLock);