diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-02 23:35:12 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-02 23:35:12 -0400 |
| commit | f8e4bc9f7789b98b54fe04df56555ca8c630df70 (patch) | |
| tree | 21ffd2455c4ce35e916cb9361b767db13aac7903 /libs/ui/Surface.cpp | |
| parent | 8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc (diff) | |
| parent | 0c4cec7e4df87181486d280c98fba9c0f4774c37 (diff) | |
| download | frameworks_base-f8e4bc9f7789b98b54fe04df56555ca8c630df70.zip frameworks_base-f8e4bc9f7789b98b54fe04df56555ca8c630df70.tar.gz frameworks_base-f8e4bc9f7789b98b54fe04df56555ca8c630df70.tar.bz2 | |
Merge change I0c4cec7e into eclair
* changes:
Attempt to fix [2152536] ANR in browser
Diffstat (limited to 'libs/ui/Surface.cpp')
| -rw-r--r-- | libs/ui/Surface.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libs/ui/Surface.cpp b/libs/ui/Surface.cpp index 64522fb..285edb4 100644 --- a/libs/ui/Surface.cpp +++ b/libs/ui/Surface.cpp @@ -733,9 +733,11 @@ status_t Surface::getBufferLocked(int index, int usage) index, usage); if (buffer != 0) { // this should never happen by construction LOGE_IF(buffer->handle == NULL, - "requestBuffer(%d, %08x) returned a buffer with a null handle", - index, usage); - if (buffer->handle != NULL) { + "Surface (identity=%d) requestBuffer(%d, %08x) returned" + "a buffer with a null handle", mIdentity, index, usage); + err = mSharedBufferClient->getStatus(); + LOGE_IF(err, "Surface (identity=%d) state = %d", mIdentity, err); + if (!err && buffer->handle != NULL) { err = getBufferMapper().registerBuffer(buffer->handle); LOGW_IF(err, "registerBuffer(...) failed %d (%s)", err, strerror(-err)); |