corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge m-c to inbound on a CLOSED TREE.

Browse Source
This commit is contained in:
Ryan VanderMeulen
2013-12-11 22:39:20 -05:00
parent 0b94e8f030 43e80af357
commit bae12afe89
92 changed files with 2850 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mobile/android/base/GeckoAppShell.java
View File

@@ -1515,9 +1515,13 @@ public class GeckoAppShell
public static boolean isNetworkLinkUp() {
ConnectivityManager cm = (ConnectivityManager)
getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo info = cm.getActiveNetworkInfo();
if (info == null || !info.isConnected())
try {
NetworkInfo info = cm.getActiveNetworkInfo();
if (info == null || !info.isConnected())
return false;
} catch (SecurityException se) {
return false;
}
return true;
}
@@ -1525,8 +1529,12 @@ public class GeckoAppShell
public static boolean isNetworkLinkKnown() {
ConnectivityManager cm = (ConnectivityManager)
getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
if (cm.getActiveNetworkInfo() == null)
try {
if (cm.getActiveNetworkInfo() == null)
return false;
} catch (SecurityException se) {
return false;
}
return true;
}