ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Change-Id: I1ddbbbec4fa5b2521ef3787bc28efe1bc90d0060
This commit is contained in:
Mathias Agopian 2010-12-13 16:47:31 -08:00
parent 802c092a8a
commit a0c6b76173
3 changed files with 4 additions and 5 deletions
Show Stats 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 *pFormat, uint32_t *pUsage) const;
static void cleanCachedSurfaces();
static void cleanCachedSurfacesLocked();
class BufferInfo {
uint32_t mWidth;

6
libs/surfaceflinger_client/Surface.cpp
View File

@ -377,7 +377,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);
@ -390,13 +390,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) {

1
services/surfaceflinger/Android.mk
View File

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