diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-07 21:07:05 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-07 21:07:05 -0400 |
| commit | c71413032e1ad1f166861a980d8547d4106f7fa0 (patch) | |
| tree | 9d429bdf840648cf344386d072dbdb9f5a2e4fc3 /libs | |
| parent | 568cae571a3d74d1992176a21722e07b44e9a3c4 (diff) | |
| parent | 0da41a3635180398ae6cbf1ff75575f5dcb6e40b (diff) | |
| download | frameworks_base-c71413032e1ad1f166861a980d8547d4106f7fa0.zip frameworks_base-c71413032e1ad1f166861a980d8547d4106f7fa0.tar.gz frameworks_base-c71413032e1ad1f166861a980d8547d4106f7fa0.tar.bz2 | |
Merge change Id23b791a into eclair
* changes:
fix [2170283] SurfaceFlinger crashes on OOM.
Diffstat (limited to 'libs')
| -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 2d83a8c..f51ca7a 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; |