i2p/i2p.i2p
1
0
Fork 0
mirror of https://github.com/i2p/i2p.i2p.git synced 2024-12-06 19:27:00 +01:00
Code Issues Actions 306 Packages Projects Releases Wiki Activity

merge of '4eee3780cfb882747ad68e39ac08b721f91c48a7'

Browse Source 
and 'cca89ae05036ab7a2fe0080fdd1cfac19968246a'
This commit is contained in:
zzz
2013-10-19 21:27:59 +00:00
parent 9cac546547 67af1a17c1
commit 63712002e2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
router/java/src/net/i2p/router/transport/TransportManager.java
+4 -2
View File
@@ -36,6 +36,7 @@ import net.i2p.router.transport.ntcp.NTCPTransport;
import net.i2p.router.transport.udp.UDPTransport;
import net.i2p.util.Addresses;
import net.i2p.util.Log;
import net.i2p.util.SystemVersion;
import net.i2p.util.Translate;
public class TransportManager implements TransportEventListener {
@@ -569,9 +570,10 @@ public class TransportManager implements TransportEventListener {
}
buf.append("</pre>\n");
out.write(buf.toString());
if (_upnpManager != null)
// newer androids crash w/ network on IO thread
if (_upnpManager != null && !SystemVersion.isAndroid())
out.write(_upnpManager.renderStatusHTML());
buf.append("</p>\n");
out.write("</p>\n");
out.flush();
}