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

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

Browse Source 
* commit 'a655a2f48e61dd44ee9f14585e0ee89202412158':
  Only show ethernet when traffic has occurred.
This commit is contained in:
Jeff Sharkey
2012-05-24 11:28:17 -07:00
committed by Android Git Automerger
parent 15841d27af a655a2f48e
commit a3a40f724e
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.
*/
public static boolean hasEthernet(Context context) {
public boolean hasEthernet(Context context) {
if (TEST_RADIOS) {
return SystemProperties.get(TEST_RADIOS_PROP).contains("ethernet");
}
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;
}
/**