Merge "minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT... (9bfe965a) · Commits · e / os / android_frameworks_native-old

include/surfaceflinger/Surface.h

+1 −1

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

+3 −3

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

+0 −1