diff options
| author | John Reck <jreck@android.com> | 2012-09-06 16:57:20 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-09-06 16:57:20 -0700 |
| commit | d22af61d97b938d0c4124fbdaae627f3e85e7084 (patch) | |
| tree | 4492011291e1da4d92bc739a0d87b90463795977 /src/com | |
| parent | 1fce2b5dc32712cb5c6e301844a736da5d4aa848 (diff) | |
| parent | 561d1954d552fe1beff6e1ec7d22147935b32c0f (diff) | |
| download | packages_apps_Browser-d22af61d97b938d0c4124fbdaae627f3e85e7084.zip packages_apps_Browser-d22af61d97b938d0c4124fbdaae627f3e85e7084.tar.gz packages_apps_Browser-d22af61d97b938d0c4124fbdaae627f3e85e7084.tar.bz2 | |
Merge "Added catch of SQLiteException when updating screenshot"
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/browser/Controller.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java index 7f40aea..56a9e20 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -35,6 +35,7 @@ import android.content.res.TypedArray; import android.database.ContentObserver; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteException; import android.graphics.Bitmap; import android.graphics.Canvas; import android.net.Uri; @@ -2138,6 +2139,10 @@ public class Controller } } catch (IllegalStateException e) { // Ignore + } catch (SQLiteException s) { + // Added for possible error when user tries to remove the same bookmark + // that is being updated with a screen shot + Log.w(LOGTAG, "Error when running updateScreenshot ", s); } finally { if (cursor != null) cursor.close(); } |