Backed out changeset e994f70de049 (bug 1265708)

This commit is contained in:
Carsten "Tomcat" Book 2016-06-04 09:24:14 +02:00
parent 3038127996
commit a9940b780e

View File

@ -17,7 +17,6 @@ import org.mozilla.gecko.db.URLMetadataTable;
import org.mozilla.gecko.favicons.cache.FaviconCache;
import org.mozilla.gecko.util.GeckoJarReader;
import org.mozilla.gecko.util.NonEvictingLruCache;
import org.mozilla.gecko.util.StringUtils;
import org.mozilla.gecko.util.ThreadUtils;
import android.content.ContentResolver;
@ -630,15 +629,13 @@ public class Favicons {
final BrowserDB db = GeckoProfile.get(context).getDB();
final String metadataQueryURL = StringUtils.stripRef(url);
final ContentResolver cr = context.getContentResolver();
final Map<String, Map<String, Object>> metadata = db.getURLMetadata().getForURLs(cr,
Collections.singletonList(metadataQueryURL),
Collections.singletonList(url),
Collections.singletonList(URLMetadataTable.TOUCH_ICON_COLUMN)
);
final Map<String, Object> row = metadata.get(metadataQueryURL);
final Map<String, Object> row = metadata.get(url);
String touchIconURL = null;