Surface metered networks as "Mobile hotspots."
String changes to give clearer definition of metered networks, and
remove metered control for mobile network. Also fix NPE when testing
hasEthernet() before session is ready.
Bug: 6494976
Change-Id: Ia55ca3362a05977b9f21ab41eb10bbc738e29620
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 94c8cda..c58e001 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -104,7 +104,6 @@
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.AdapterView.OnItemSelectedListener;
@@ -2164,15 +2163,19 @@
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);
+ if (mStatsSession != null) {
+ try {
+ ethernetBytes = mStatsSession.getSummaryForNetwork(
+ NetworkTemplate.buildTemplateEthernet(), Long.MIN_VALUE, Long.MAX_VALUE)
+ .getTotalBytes();
+ } catch (RemoteException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ ethernetBytes = 0;
}
- // suppress ethernet unless traffic has occurred
+ // only show ethernet when both hardware present and traffic has occurred
return hasEthernet && ethernetBytes > 0;
}