diff options
author | Michael Kolb <kolby@google.com> | 2011-08-09 14:59:59 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-09 14:59:59 -0700 |
commit | 3a623bbecb74911d86d052f1b521c01a7ca18d3f (patch) | |
tree | 48b4fb075b911d309cae398d5dfc4b3e610ac542 | |
parent | 1e0b3b16c6daa09dbc84fd53d05889e99685d137 (diff) | |
parent | d837a11b0ada5a4577af954e4cc0d33047f84ce8 (diff) | |
download | packages_apps_Browser-3a623bbecb74911d86d052f1b521c01a7ca18d3f.zip packages_apps_Browser-3a623bbecb74911d86d052f1b521c01a7ca18d3f.tar.gz packages_apps_Browser-3a623bbecb74911d86d052f1b521c01a7ca18d3f.tar.bz2 |
Merge "suppress copyPixel error"
-rw-r--r-- | src/com/android/browser/Tab.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java index 39bf49c..ead1576 100644 --- a/src/com/android/browser/Tab.java +++ b/src/com/android/browser/Tab.java @@ -2086,11 +2086,14 @@ class Tab implements PictureListener { return; } ByteBuffer buffer = ByteBuffer.wrap(blob); - if (buffer.capacity() != blob.length) { - Log.e(LOGTAG, "Load capture has mismatched sizes: " - + buffer.capacity() + " vs " + blob.length); + try { + mCapture.copyPixelsFromBuffer(buffer); + } catch (RuntimeException rex) { + Log.e(LOGTAG, "Load capture has mismatched sizes; buffer: " + + buffer.capacity() + " blob: " + blob.length + + "capture: " + mCapture.getByteCount()); + throw rex; } - mCapture.copyPixelsFromBuffer(buffer); } } |