Move to INetworkStatsSession with lifecycle.
Explicitly communicate lifecycle, enabling system_server to cache
stats when actively being used.
Bug: 6236498
Change-Id: Ieecc4b1d4fd46aeb5207c4ba9b450e04e9438d00
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 656288a..d127204 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -69,11 +69,13 @@
import android.net.ConnectivityManager;
import android.net.INetworkPolicyManager;
import android.net.INetworkStatsService;
+import android.net.INetworkStatsSession;
import android.net.NetworkPolicy;
import android.net.NetworkPolicyManager;
import android.net.NetworkStats;
import android.net.NetworkStatsHistory;
import android.net.NetworkTemplate;
+import android.net.TrafficStats;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.INetworkManagementService;
@@ -186,6 +188,8 @@
private NetworkPolicyManager mPolicyManager;
private ConnectivityManager mConnService;
+ private INetworkStatsSession mStatsSession;
+
private static final String PREF_FILE = "data_usage";
private static final String PREF_SHOW_WIFI = "show_wifi";
private static final String PREF_SHOW_ETHERNET = "show_ethernet";
@@ -285,6 +289,12 @@
mUidDetailProvider = new UidDetailProvider(context);
+ try {
+ mStatsSession = mStatsService.openSession();
+ } catch (RemoteException e) {
+ throw new RuntimeException(e);
+ }
+
mTabHost = (TabHost) view.findViewById(android.R.id.tabhost);
mTabsContainer = (ViewGroup) view.findViewById(R.id.tabs_container);
mTabWidget = (TabWidget) view.findViewById(android.R.id.tabs);
@@ -533,6 +543,8 @@
mUidDetailProvider.clearCache();
mUidDetailProvider = null;
+
+ TrafficStats.closeQuietly(mStatsSession);
}
@Override
@@ -1139,7 +1151,7 @@
ChartData>() {
/** {@inheritDoc} */
public Loader<ChartData> onCreateLoader(int id, Bundle args) {
- return new ChartDataLoader(getActivity(), mStatsService, args);
+ return new ChartDataLoader(getActivity(), mStatsSession, args);
}
/** {@inheritDoc} */
@@ -1170,7 +1182,7 @@
NetworkStats>() {
/** {@inheritDoc} */
public Loader<NetworkStats> onCreateLoader(int id, Bundle args) {
- return new SummaryForAllUidLoader(getActivity(), mStatsService, args);
+ return new SummaryForAllUidLoader(getActivity(), mStatsSession, args);
}
/** {@inheritDoc} */