diff options
| author | John Reck <jreck@android.com> | 2012-09-06 17:11:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-06 17:11:39 -0700 |
| commit | 34c8499cc0fadea73233b0bd8e33f26811972ad1 (patch) | |
| tree | c2c35df2c268553d7395fa50a52ac61d2ba8af9d /src/com/android/browser | |
| parent | e9caeafa9a953be0cbe974043920d72cec9ddf22 (diff) | |
| parent | d22af61d97b938d0c4124fbdaae627f3e85e7084 (diff) | |
| download | packages_apps_browser-34c8499cc0fadea73233b0bd8e33f26811972ad1.zip packages_apps_browser-34c8499cc0fadea73233b0bd8e33f26811972ad1.tar.gz packages_apps_browser-34c8499cc0fadea73233b0bd8e33f26811972ad1.tar.bz2 | |
am d22af61d: Merge "Added catch of SQLiteException when updating screenshot"
* commit 'd22af61d97b938d0c4124fbdaae627f3e85e7084':
Added catch of SQLiteException when updating screenshot
Diffstat (limited to 'src/com/android/browser')
| -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 e84e397..846d41f 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; @@ -2139,6 +2140,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(); } |