diff options
| author | Mathias Agopian <mathias@google.com> | 2010-12-14 15:51:32 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-14 15:51:32 -0800 |
| commit | 52e6ada69e0cdc4366f97cef12d8ce93c52c3b24 (patch) | |
| tree | 886362a7280b263bd522599988086c093e7dfe7e | |
| parent | aa0e56f9f2f353f969a7230eb8d038fffff4d6da (diff) | |
| parent | 06f9ebf4f6178d6b6970cace263ee180d4b61d36 (diff) | |
| download | frameworks_base-52e6ada69e0cdc4366f97cef12d8ce93c52c3b24.zip frameworks_base-52e6ada69e0cdc4366f97cef12d8ce93c52c3b24.tar.gz frameworks_base-52e6ada69e0cdc4366f97cef12d8ce93c52c3b24.tar.bz2 | |
Merge "minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so."
| -rw-r--r-- | include/surfaceflinger/Surface.h | 2 | ||||
| -rw-r--r-- | libs/surfaceflinger_client/Surface.cpp | 6 | ||||
| -rw-r--r-- | services/surfaceflinger/Android.mk | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/include/surfaceflinger/Surface.h b/include/surfaceflinger/Surface.h index cef439c..2df8ca3 100644 --- a/include/surfaceflinger/Surface.h +++ b/include/surfaceflinger/Surface.h @@ -249,7 +249,7 @@ private: uint32_t *pWidth, uint32_t *pHeight, uint32_t *pFormat, uint32_t *pUsage) const; - static void cleanCachedSurfaces(); + static void cleanCachedSurfacesLocked(); class BufferInfo { uint32_t mWidth; 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) { diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk index 74d1ac9..8a00a2e 100644 --- a/services/surfaceflinger/Android.mk +++ b/services/surfaceflinger/Android.mk @@ -35,7 +35,6 @@ endif LOCAL_SHARED_LIBRARIES := \ libcutils \ - libpixelflinger \ libhardware \ libutils \ libEGL \ |