Commit af275ef4 authored Oct 07, 2009 by Mathias Agopian Committed by Android Git Automerger Oct 07, 2009

am c7141303: Merge change Id23b791a into eclair

Merge commit 'c71413032e1ad1f166861a980d8547d4106f7fa0' into eclair-mr2

* commit 'c71413032e1ad1f166861a980d8547d4106f7fa0':
  fix [2170283] SurfaceFlinger crashes on OOM.

parents 22e24aa8 11590bbe

libs/ui/Surface.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -746,6 +746,8 @@ status_t Surface::getBufferLocked(int index, int usage)
		currentBuffer->setIndex(index);
		mNeedFullUpdate = true;
		}
		} else {
		err = err<0 ? err : NO_MEMORY;
		}
		}
		return err;