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

Get ethernet data usage from NetworkStatsManager.

Browse Source 
- change to use NetworkStatsManager.querySummaryForUser() to check for
ethernet usage data instead of getting it from INetworkStatsSession.

Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: I60364b4a5f7879906beba194c50955154d56803a
This commit is contained in:
Doris Ling
2018-10-03 17:17:52 -07:00
parent 3c5850ee62
commit ab9c9e4df9
2 changed files with 68 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/com/android/settings/datausage/DataUsageUtils.java
View File

@@ -18,6 +18,8 @@ import static android.net.ConnectivityManager.TYPE_MOBILE;
import static android.net.ConnectivityManager.TYPE_WIFI;
import static android.telephony.TelephonyManager.SIM_STATE_READY;
import android.app.usage.NetworkStats.Bucket;
import android.app.usage.NetworkStatsManager;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.INetworkStatsService;
@@ -33,8 +35,11 @@ import android.telephony.TelephonyManager;
import android.text.BidiFormatter;
import android.text.format.Formatter;
import android.text.format.Formatter.BytesResult;
import android.util.FeatureFlagUtils;
import android.util.Log;
import com.android.settings.core.FeatureFlags;
import java.util.List;
/**
@@ -69,28 +74,48 @@ public final class DataUsageUtils {
}
final ConnectivityManager conn = ConnectivityManager.from(context);
final boolean hasEthernet = conn.isNetworkSupported(ConnectivityManager.TYPE_ETHERNET);
final long ethernetBytes;
try {
INetworkStatsService statsService = INetworkStatsService.Stub.asInterface(
ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
INetworkStatsSession statsSession = statsService.openSession();
if (statsSession != null) {
ethernetBytes = statsSession.getSummaryForNetwork(
NetworkTemplate.buildTemplateEthernet(), Long.MIN_VALUE, Long.MAX_VALUE)
.getTotalBytes();
TrafficStats.closeQuietly(statsSession);
} else {
ethernetBytes = 0;
}
} catch (RemoteException e) {
throw new RuntimeException(e);
if (!conn.isNetworkSupported(ConnectivityManager.TYPE_ETHERNET)) {
return false;
}
// only show ethernet when both hardware present and traffic has occurred
return hasEthernet && ethernetBytes > 0;
if (FeatureFlagUtils.isEnabled(context, FeatureFlags.DATA_USAGE_V2)) {
final TelephonyManager telephonyManager = TelephonyManager.from(context);;
final NetworkStatsManager networkStatsManager =
context.getSystemService(NetworkStatsManager.class);
boolean hasEthernetUsage = false;
try {
final Bucket bucket = networkStatsManager.querySummaryForUser(
ConnectivityManager.TYPE_ETHERNET, telephonyManager.getSubscriberId(),
0L /* startTime */, System.currentTimeMillis() /* endTime */);
if (bucket != null) {
hasEthernetUsage = bucket.getRxBytes() > 0 || bucket.getTxBytes() > 0;
}
} catch (RemoteException e) {
Log.e(TAG, "Exception querying network detail.", e);
}
return hasEthernetUsage;
} else {
final long ethernetBytes;
try {
INetworkStatsService statsService = INetworkStatsService.Stub.asInterface(
ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
INetworkStatsSession statsSession = statsService.openSession();
if (statsSession != null) {
ethernetBytes = statsSession.getSummaryForNetwork(
NetworkTemplate.buildTemplateEthernet(), Long.MIN_VALUE, Long.MAX_VALUE)
.getTotalBytes();
TrafficStats.closeQuietly(statsSession);
} else {
ethernetBytes = 0;
}
} catch (RemoteException e) {
throw new RuntimeException(e);
}
// only show ethernet when both hardware present and traffic has occurred
return ethernetBytes > 0;
}
}
/**