diff options
| author | 2009-10-07 21:07:05 -0400 | |
|---|---|---|
| committer | 2009-10-07 21:07:05 -0400 | |
| commit | 11590bbe1c12af8ba7bf6bc0d3883efcf15dbac1 (patch) | |
| tree | 48feaca0f7fab325bf60d0c2a6de3a425de82926 /libs/ui/Surface.cpp | |
| parent | 28541629e163399fd1cac126e06868ecf1b4811e (diff) | |
| parent | d3144beec6acb37702629799a2adbeccc72ca222 (diff) | |
Merge change Id23b791a into eclair
* changes:
fix [2170283] SurfaceFlinger crashes on OOM.
Diffstat (limited to 'libs/ui/Surface.cpp')
| -rw-r--r-- | libs/ui/Surface.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/ui/Surface.cpp b/libs/ui/Surface.cpp index 2d83a8c310..f51ca7a953 100644 --- a/libs/ui/Surface.cpp +++ b/libs/ui/Surface.cpp @@ -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; |