PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only show ethernet when traffic has occurred." into jb-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2012-05-24 11:25:55 -07:00
committed by Android (Google) Code Review
parent 6e9e519560 b67c4a8e73
commit a655a2f48e
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/DataUsageSummary.java
View File

@@ -2155,13 +2155,25 @@ public class DataUsageSummary extends Fragment {
/** /**
* Test if device has an ethernet network connection. * Test if device has an ethernet network connection.
*/ */
public static boolean hasEthernet(Context context) { public boolean hasEthernet(Context context) {
if (TEST_RADIOS) { if (TEST_RADIOS) {
return SystemProperties.get(TEST_RADIOS_PROP).contains("ethernet"); return SystemProperties.get(TEST_RADIOS_PROP).contains("ethernet");
} }
final ConnectivityManager conn = ConnectivityManager.from(context); final ConnectivityManager conn = ConnectivityManager.from(context);
return conn.isNetworkSupported(TYPE_ETHERNET); final boolean hasEthernet = conn.isNetworkSupported(TYPE_ETHERNET);
final long ethernetBytes;
try {
ethernetBytes = mStatsSession.getSummaryForNetwork(
NetworkTemplate.buildTemplateEthernet(), Long.MIN_VALUE, Long.MAX_VALUE)
.getTotalBytes();
} catch (RemoteException e) {
throw new RuntimeException(e);
}
// suppress ethernet unless traffic has occurred
return hasEthernet && ethernetBytes > 0;
} }
/** /**