am f82dfdd0: am 380ac10b: Merge change Id9898b22 into eclair

Merge commit 'f82dfdd0fe7237434519c6d468c11a293cf63301'

* commit 'f82dfdd0fe7237434519c6d468c11a293cf63301':
  Check to make sure the captured picture is non null before using.

1 files changed, 7 insertions, 0 deletions

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 15f986e..d0ebc8b 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -2420,6 +2420,10 @@ public class BrowserActivity extends Activity
                     final ByteArrayOutputStream os
                             = new ByteArrayOutputStream();
                     Bitmap bm = createScreenshot(view);
+                    if (bm == null) {
+                        c.close();
+                        return;
+                    }
                     bm.compress(Bitmap.CompressFormat.PNG, 100, os);
                     values = new ContentValues();
                     values.put(Browser.BookmarkColumns.THUMBNAIL,
@@ -2470,6 +2474,9 @@ public class BrowserActivity extends Activity
 
     private Bitmap createScreenshot(WebView view) {
         Picture thumbnail = view.capturePicture();
+        if (thumbnail == null) {
+            return null;
+        }
         Bitmap bm = Bitmap.createBitmap(getDesiredThumbnailWidth(this),
                 getDesiredThumbnailHeight(this), Bitmap.Config.ARGB_4444);
         Canvas canvas = new Canvas(bm);