summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattias Nilsson <mattias2.nilsson@sonyericsson.com>2011-10-04 10:18:50 +0200
committerJohan Redestig <johan.redestig@sonymobile.com>2012-09-06 14:27:45 +0200
commit561d1954d552fe1beff6e1ec7d22147935b32c0f (patch)
tree4492011291e1da4d92bc739a0d87b90463795977 /src
parent1fce2b5dc32712cb5c6e301844a736da5d4aa848 (diff)
downloadpackages_apps_browser-561d1954d552fe1beff6e1ec7d22147935b32c0f.zip
packages_apps_browser-561d1954d552fe1beff6e1ec7d22147935b32c0f.tar.gz
packages_apps_browser-561d1954d552fe1beff6e1ec7d22147935b32c0f.tar.bz2
Added catch of SQLiteException when updating screenshot
Error found when running Monkey test. User probably tries to add a bookmark and directly after deleting it. The method updateScreenshot is running an AsyncTask and gets an Exception from the database when the bookmark does not exist. The deletion of the bookmark runs in another thread. Change-Id: I63bb954419f60fb5106c1a6597692b6bac925714
Diffstat (limited to 'src')
-rw-r--r--src/com/android/browser/Controller.java5
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();
}