wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 919645 - crash in android.os.NetworkOnMainThreadException. r=bnicholson

Browse Source
This commit is contained in:
Richard Newman 2013-10-07 12:54:41 -07:00
parent cea1616fed
commit 4aade40455
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mobile/android/base/favicons/LoadFaviconTask.java
View File

@ -18,6 +18,7 @@ import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.db.BrowserDB;
import org.mozilla.gecko.gfx.BitmapUtils;
import org.mozilla.gecko.util.GeckoJarReader;
import org.mozilla.gecko.util.ThreadUtils;
import org.mozilla.gecko.util.UiAsyncTask;
import static org.mozilla.gecko.favicons.Favicons.sContext;
@ -212,8 +213,21 @@ public class LoadFaviconTask extends UiAsyncTask<Void, Void, Bitmap> {
}
static void closeHTTPClient() {
if (sHttpClient != null) {
sHttpClient.close();
// This work must be done on a background thread because it shuts down
// the connection pool, which typically involves closing a connection --
// which counts as network activity.
if (ThreadUtils.isOnBackgroundThread()) {
if (sHttpClient != null) {
sHttpClient.close();
}
return;
}
ThreadUtils.postToBackgroundThread(new Runnable() {
@Override
public void run() {
LoadFaviconTask.closeHTTPClient();
}
});
}
}