Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)" into gingerbread

Browse Source
This commit is contained in:
Mathias Agopian
2011-01-25 14:42:59 -08:00
committed by Android (Google) Code Review
parent f126ad3b64 728d849fc9
commit d3fcd0a1c9
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/surfaceflinger/Surface.h
View File

@@ -248,7 +248,7 @@ private:
uint32_t *pWidth, uint32_t *pHeight, uint32_t *pWidth, uint32_t *pHeight,
uint32_t *pFormat, uint32_t *pUsage) const; uint32_t *pFormat, uint32_t *pUsage) const;
static void cleanCachedSurfaces(); static void cleanCachedSurfacesLocked();
class BufferInfo { class BufferInfo {
uint32_t mWidth; uint32_t mWidth;

6
libs/surfaceflinger_client/Surface.cpp
View File

@@ -377,7 +377,7 @@ status_t Surface::writeToParcel(
Mutex Surface::sCachedSurfacesLock; 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) { sp<Surface> Surface::readFromParcel(const Parcel& data) {
Mutex::Autolock _l(sCachedSurfacesLock); Mutex::Autolock _l(sCachedSurfacesLock);
@@ -390,13 +390,13 @@ sp<Surface> Surface::readFromParcel(const Parcel& data) {
if (surface->mSurface == 0) { if (surface->mSurface == 0) {
surface = 0; surface = 0;
} }
cleanCachedSurfaces(); cleanCachedSurfacesLocked();
return surface; return surface;
} }
// Remove the stale entries from the surface cache. This should only be called // Remove the stale entries from the surface cache. This should only be called
// with sCachedSurfacesLock held. // with sCachedSurfacesLock held.
void Surface::cleanCachedSurfaces() { void Surface::cleanCachedSurfacesLocked() {
for (int i = sCachedSurfaces.size()-1; i >= 0; --i) { for (int i = sCachedSurfaces.size()-1; i >= 0; --i) {
wp<Surface> s(sCachedSurfaces.valueAt(i)); wp<Surface> s(sCachedSurfaces.valueAt(i));
if (s == 0 || s.promote() == 0) { if (s == 0 || s.promote() == 0) {

1
services/surfaceflinger/Android.mk
View File

@@ -37,7 +37,6 @@ endif
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
libpixelflinger \
libhardware \ libhardware \
libutils \ libutils \
libEGL \ libEGL \