From 06f9ebf4f6178d6b6970cace263ee180d4b61d36 Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Mon, 13 Dec 2010 16:47:31 -0800 Subject: minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. Change-Id: I3bdca74351c8e480a05084bc412a96c5f685221d --- libs/surfaceflinger_client/Surface.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libs/surfaceflinger_client') 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 > Surface::sCachedSurfaces(wp(0)); +DefaultKeyedVector, wp > Surface::sCachedSurfaces; sp Surface::readFromParcel(const Parcel& data) { Mutex::Autolock _l(sCachedSurfacesLock); @@ -397,13 +397,13 @@ sp 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 s(sCachedSurfaces.valueAt(i)); if (s == 0 || s.promote() == 0) { -- cgit v1.1