Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove WebIconDatabase calls from android.provider.Browser

Browse Source 
This class has been deprecated, so no need to call it.

Bug: 15088030
Change-Id: I6092a9d5f7a12cc14def0996efff7cb689935acb
This commit is contained in:
Justin Koh
2014-06-09 14:59:17 -07:00
parent 3f175a3587
commit b7c39cee9e
1 changed files with 9 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/java/android/provider/Browser.java
View File

@@ -405,17 +405,10 @@ public class Browser {
null, null, History.DATE_LAST_VISITED + " ASC"); null, null, History.DATE_LAST_VISITED + " ASC");
if (cursor.moveToFirst() && cursor.getCount() >= MAX_HISTORY_COUNT) { if (cursor.moveToFirst() && cursor.getCount() >= MAX_HISTORY_COUNT) {
WebIconDatabase iconDb = null;
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) {
iconDb = WebIconDatabase.getInstance();
}
/* eliminate oldest history items */ /* eliminate oldest history items */
for (int i = 0; i < TRUNCATE_N_OLDEST; i++) { for (int i = 0; i < TRUNCATE_N_OLDEST; i++) {
cr.delete(ContentUris.withAppendedId(History.CONTENT_URI, cursor.getLong(0)), cr.delete(ContentUris.withAppendedId(History.CONTENT_URI, cursor.getLong(0)),
null, null); null, null);
if (iconDb != null) {
iconDb.releaseIconForPageUrl(cursor.getString(1));
}
if (!cursor.moveToNext()) break; if (!cursor.moveToNext()) break;
} }
} }
@@ -475,18 +468,6 @@ public class Browser {
cursor = cr.query(History.CONTENT_URI, new String[] { History.URL }, whereClause, cursor = cr.query(History.CONTENT_URI, new String[] { History.URL }, whereClause,
null, null); null, null);
if (cursor.moveToFirst()) { if (cursor.moveToFirst()) {
WebIconDatabase iconDb = null;
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) {
iconDb = WebIconDatabase.getInstance();
}
do {
// Delete favicons
// TODO don't release if the URL is bookmarked
if (iconDb != null) {
iconDb.releaseIconForPageUrl(cursor.getString(0));
}
} while (cursor.moveToNext());
cr.delete(History.CONTENT_URI, whereClause, null); cr.delete(History.CONTENT_URI, whereClause, null);
} }
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
@@ -579,9 +560,7 @@ public class Browser {
*/ */
public static final void requestAllIcons(ContentResolver cr, String where, public static final void requestAllIcons(ContentResolver cr, String where,
WebIconDatabase.IconListener listener) { WebIconDatabase.IconListener listener) {
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) { // Do nothing: this is no longer used.
WebIconDatabase.getInstance().bulkRequestIconForPageUrl(cr, where, listener);
}
} }
/** /**