summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-12-14 15:51:32 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-12-14 15:51:32 -0800
commit52e6ada69e0cdc4366f97cef12d8ce93c52c3b24 (patch)
tree886362a7280b263bd522599988086c093e7dfe7e /libs
parentaa0e56f9f2f353f969a7230eb8d038fffff4d6da (diff)
parent06f9ebf4f6178d6b6970cace263ee180d4b61d36 (diff)
downloadframeworks_base-52e6ada69e0cdc4366f97cef12d8ce93c52c3b24.zip
frameworks_base-52e6ada69e0cdc4366f97cef12d8ce93c52c3b24.tar.gz
frameworks_base-52e6ada69e0cdc4366f97cef12d8ce93c52c3b24.tar.bz2
Merge "minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so."
Diffstat (limited to 'libs')
-rw-r--r--libs/surfaceflinger_client/Surface.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/surfaceflinger_client/Surface.cpp b/libs/surfaceflinger_client/Surface.cpp
index 6d82b5d..aa0c2e8 100644
--- a/libs/surfaceflinger_client/Surface.cpp
+++ b/libs/surfaceflinger_client/Surface.cpp
@@ -384,7 +384,7 @@ status_t Surface::writeToParcel(
Mutex Surface::sCachedSurfacesLock;
-DefaultKeyedVector<wp<IBinder>, wp<Surface> > Surface::sCachedSurfaces(wp<Surface>(0));
+DefaultKeyedVector<wp<IBinder>, wp<Surface> > Surface::sCachedSurfaces;
sp<Surface> Surface::readFromParcel(const Parcel& data) {
Mutex::Autolock _l(sCachedSurfacesLock);
@@ -397,13 +397,13 @@ sp<Surface> Surface::readFromParcel(const Parcel& data) {
if (surface->mSurface == 0) {
surface = 0;
}
- cleanCachedSurfaces();
+ cleanCachedSurfacesLocked();
return surface;
}
// Remove the stale entries from the surface cache. This should only be called
// with sCachedSurfacesLock held.
-void Surface::cleanCachedSurfaces() {
+void Surface::cleanCachedSurfacesLocked() {
for (int i = sCachedSurfaces.size()-1; i >= 0; --i) {
wp<Surface> s(sCachedSurfaces.valueAt(i));
if (s == 0 || s.promote() == 0) {