diff --git a/mobile/android/base/AwesomeBarTabs.java b/mobile/android/base/AwesomeBarTabs.java index 140ff24995c4..899ecdc45e31 100644 --- a/mobile/android/base/AwesomeBarTabs.java +++ b/mobile/android/base/AwesomeBarTabs.java @@ -476,8 +476,11 @@ public class AwesomeBarTabs extends TabHost { View indicatorView = inflater.inflate(R.layout.awesomebar_tab_indicator, null); Drawable background = indicatorView.getBackground(); - background.setColorFilter(new LightingColorFilter(Color.WHITE, GeckoApp.mBrowserToolbar.getHighlightColor())); - + try { + background.setColorFilter(new LightingColorFilter(Color.WHITE, GeckoApp.mBrowserToolbar.getHighlightColor())); + } catch (Exception e) { + Log.d(LOGTAG, "background.setColorFilter failed " + e); + } TextView title = (TextView) indicatorView.findViewById(R.id.title); title.setText(titleId); diff --git a/mobile/android/base/Tab.java b/mobile/android/base/Tab.java index 1032a38d7e0c..70463eb726d3 100644 --- a/mobile/android/base/Tab.java +++ b/mobile/android/base/Tab.java @@ -414,32 +414,35 @@ public class Tab { } private void saveThumbnailToDB(Bitmap bitmap) { - ContentResolver resolver = Tabs.getInstance().getContentResolver(); - Cursor cursor = resolver.query(Browser.BOOKMARKS_URI, - null, - Browser.BookmarkColumns.URL + " = ?", - new String[] { getURL() }, - Browser.BookmarkColumns.URL); + try { + ContentResolver resolver = Tabs.getInstance().getContentResolver(); + Cursor cursor = resolver.query(Browser.BOOKMARKS_URI, + null, + Browser.BookmarkColumns.URL + " = ?", + new String[] { getURL() }, + Browser.BookmarkColumns.URL); - ContentValues values = new ContentValues(); - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - bitmap.compress(Bitmap.CompressFormat.PNG, 0, bos); - values.put("thumbnail", bos.toByteArray()); + ContentValues values = new ContentValues(); + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + bitmap.compress(Bitmap.CompressFormat.PNG, 0, bos); + values.put("thumbnail", bos.toByteArray()); - if (cursor.getCount() == 1) { - //entry exists, update the bookmark flag - resolver.update(Browser.BOOKMARKS_URI, - values, - Browser.BookmarkColumns.URL + " = ?", - new String[] { getURL() }); - } else { - //add a new entry - values.put(Browser.BookmarkColumns.URL, mUrl); - resolver.insert(Browser.BOOKMARKS_URI, - values); + if (cursor.getCount() == 1) { + //entry exists, update the bookmark flag + resolver.update(Browser.BOOKMARKS_URI, + values, + Browser.BookmarkColumns.URL + " = ?", + new String[] { getURL() }); + } else { + //add a new entry + values.put(Browser.BookmarkColumns.URL, mUrl); + resolver.insert(Browser.BOOKMARKS_URI, + values); + } + cursor.close(); + } catch (IllegalArgumentException e) { + // ignore } - - cursor.close(); } private class RemoveBookmarkTask extends GeckoAsyncTask {