Merge change 27416 into eclair

* changes:
  Only update the bookmark screenshot if the page completed loading fully (i.e. do not save a screenshot if the user canceled loading.
diff --git a/src/com/android/browser/AddBookmarkPage.java b/src/com/android/browser/AddBookmarkPage.java
index 7878762..71bf481 100644
--- a/src/com/android/browser/AddBookmarkPage.java
+++ b/src/com/android/browser/AddBookmarkPage.java
@@ -161,7 +161,7 @@
 
                 // Only use mThumbnail if url and mOriginalUrl are matches.
                 // Otherwise the user edited the url and the thumbnail no longer applies.
-                if (mOriginalUrl.equals(url)) {
+                if (url.equals(mOriginalUrl)) {
                     Bookmarks.addBookmark(null, cr, url, title, mThumbnail, true);
                 } else {
                     Bookmarks.addBookmark(null, cr, url, title, null, true);