Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5eee3d2b authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so."

parents 90f96b83 455d18d4

include/surfaceflinger/Surface.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

libs/surfaceflinger_client/Surface.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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) {

services/surfaceflinger/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ endif 


LOCAL_SHARED_LIBRARIES := \

	libcutils \

	libpixelflinger \

	libhardware \

	libutils \

	libEGL \