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

Use the new network stats loader to get usage data for all apps.

Browse Source 
- change to use the new NetworkStats.Bucket instead of
NetworkStats.Entry when iterating through the detail data.

Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: I305cc384320e4a72531d80dd9a00a3034ab12837
This commit is contained in:
Doris Ling
2018-09-17 12:46:49 -07:00
parent 8dbbb01f19
commit 27ee2f0865
3 changed files with 56 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/com/android/settings/datausage/DataUsageListV2.java
View File

@@ -21,6 +21,8 @@ import static android.net.TrafficStats.UID_TETHERING;
import static android.telephony.TelephonyManager.SIM_STATE_READY;
import android.app.ActivityManager;
import android.app.usage.NetworkStats;
import android.app.usage.NetworkStats.Bucket;
import android.content.Context;
import android.content.Intent;
import android.content.pm.UserInfo;
@@ -28,7 +30,6 @@ import android.graphics.Color;
import android.net.ConnectivityManager;
import android.net.INetworkStatsSession;
import android.net.NetworkPolicy;
import android.net.NetworkStats;
import android.net.NetworkStatsHistory;
import android.net.NetworkTemplate;
import android.net.TrafficStats;
@@ -65,7 +66,7 @@ import com.android.settings.widget.LoadingViewController;
import com.android.settingslib.AppItem;
import com.android.settingslib.net.ChartData;
import com.android.settingslib.net.ChartDataLoaderCompat;
import com.android.settingslib.net.SummaryForAllUidLoaderCompat;
import com.android.settingslib.net.NetworkStatsDetailLoader;
import com.android.settingslib.net.UidDetailProvider;
import java.util.ArrayList;
@@ -78,8 +79,9 @@ import java.util.List;
*/
public class DataUsageListV2 extends DataUsageBaseFragment {
public static final String EXTRA_SUB_ID = "sub_id";
public static final String EXTRA_NETWORK_TEMPLATE = "network_template";
static final String EXTRA_SUB_ID = "sub_id";
static final String EXTRA_NETWORK_TEMPLATE = "network_template";
static final String EXTRA_NETWORK_TYPE = "network_type";
private static final String TAG = "DataUsageListV2";
private static final boolean LOGD = false;
@@ -106,6 +108,8 @@ public class DataUsageListV2 extends DataUsageBaseFragment {
NetworkTemplate mTemplate;
@VisibleForTesting
int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
@VisibleForTesting
int mNetworkType;
private ChartData mChartData;
private LoadingViewController mLoadingViewController;
@@ -249,6 +253,7 @@ public class DataUsageListV2 extends DataUsageBaseFragment {
if (args != null) {
mSubId = args.getInt(EXTRA_SUB_ID, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
mTemplate = args.getParcelable(EXTRA_NETWORK_TEMPLATE);
mNetworkType = args.getInt(EXTRA_NETWORK_TYPE, ConnectivityManager.TYPE_MOBILE);
}
if (mTemplate == null && mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
final Intent intent = getIntent();
@@ -336,8 +341,8 @@ public class DataUsageListV2 extends DataUsageBaseFragment {
}
// kick off loader for detailed stats
getLoaderManager().restartLoader(LOADER_SUMMARY,
SummaryForAllUidLoaderCompat.buildArgs(mTemplate, start, end), mSummaryCallbacks);
getLoaderManager().restartLoader(LOADER_SUMMARY, null /* args */,
mNetworkStatsDetailCallbacks);
final long totalBytes = entry != null ? entry.rxBytes + entry.txBytes : 0;
final CharSequence totalPhrase = DataUsageUtils.formatDataUsage(context, totalBytes);
@@ -348,22 +353,26 @@ public class DataUsageListV2 extends DataUsageBaseFragment {
* Bind the given {@link NetworkStats}, or {@code null} to clear list.
*/
public void bindStats(NetworkStats stats, int[] restrictedUids) {
ArrayList<AppItem> items = new ArrayList<>();
mApps.removeAll();
if (stats == null) {
if (LOGD) {
Log.d(TAG, "No network stats data. App list cleared.");
}
return;
}
final ArrayList<AppItem> items = new ArrayList<>();
long largest = 0;
final int currentUserId = ActivityManager.getCurrentUser();
UserManager userManager = UserManager.get(getContext());
final UserManager userManager = UserManager.get(getContext());
final List<UserHandle> profiles = userManager.getUserProfiles();
final SparseArray<AppItem> knownItems = new SparseArray<AppItem>();
NetworkStats.Entry entry = null;
final int size = stats != null ? stats.size() : 0;
for (int i = 0; i < size; i++) {
entry = stats.getValues(i, entry);
final Bucket bucket = new Bucket();
while (stats.hasNextBucket() && stats.getNextBucket(bucket)) {
// Decide how to collapse items together
final int uid = entry.uid;
final int uid = bucket.getUid();
final int collapseKey;
final int category;
final int userId = UserHandle.getUserId(uid);
@@ -372,8 +381,8 @@ public class DataUsageListV2 extends DataUsageBaseFragment {
if (userId != currentUserId) {
// Add to a managed user item.
final int managedKey = UidDetailProvider.buildKeyForUser(userId);
largest = accumulate(managedKey, knownItems, entry, AppItem.CATEGORY_USER,
items, largest);
largest = accumulate(managedKey, knownItems, bucket,
AppItem.CATEGORY_USER, items, largest);
}
// Add to app item.
collapseKey = uid;
@@ -397,8 +406,9 @@ public class DataUsageListV2 extends DataUsageBaseFragment {
collapseKey = android.os.Process.SYSTEM_UID;
category = AppItem.CATEGORY_APP;
}
largest = accumulate(collapseKey, knownItems, entry, category, items, largest);
largest = accumulate(collapseKey, knownItems, bucket, category, items, largest);
}
stats.close();
final int restrictedUidsMax = restrictedUids.length;
for (int i = 0; i < restrictedUidsMax; ++i) {
@@ -419,7 +429,6 @@ public class DataUsageListV2 extends DataUsageBaseFragment {
}
Collections.sort(items);
mApps.removeAll();
for (int i = 0; i < items.size(); i++) {
final int percentTotal = largest != 0 ? (int) (items.get(i).total * 100 / largest) : 0;
AppDataUsagePreference preference = new AppDataUsagePreference(getContext(),
@@ -456,12 +465,12 @@ public class DataUsageListV2 extends DataUsageBaseFragment {
*
* @param collapseKey the collapse key used to map the item.
* @param knownItems collection of known (already existing) items.
* @param entry the network stats entry to extract data usage from.
* @param bucket the network stats bucket to extract data usage from.
* @param itemCategory the item is categorized on the list view by this category. Must be
*/
private static long accumulate(int collapseKey, final SparseArray<AppItem> knownItems,
NetworkStats.Entry entry, int itemCategory, ArrayList<AppItem> items, long largest) {
final int uid = entry.uid;
Bucket bucket, int itemCategory, ArrayList<AppItem> items, long largest) {
final int uid = bucket.getUid();
AppItem item = knownItems.get(collapseKey);
if (item == null) {
item = new AppItem(collapseKey);
@@ -470,7 +479,7 @@ public class DataUsageListV2 extends DataUsageBaseFragment {
knownItems.put(item.key, item);
}
item.addUid(uid);
item.total += entry.rxBytes + entry.txBytes;
item.total += bucket.getRxBytes() + bucket.getTxBytes();
return Math.max(largest, item.total);
}
@@ -579,11 +588,16 @@ public class DataUsageListV2 extends DataUsageBaseFragment {
}
};
private final LoaderCallbacks<NetworkStats> mSummaryCallbacks = new LoaderCallbacks<
NetworkStats>() {
private final LoaderCallbacks<NetworkStats> mNetworkStatsDetailCallbacks =
new LoaderCallbacks<NetworkStats>() {
@Override
public Loader<NetworkStats> onCreateLoader(int id, Bundle args) {
return new SummaryForAllUidLoaderCompat(getActivity(), mStatsSession, args);
return new NetworkStatsDetailLoader.Builder(getContext())
.setStartTime(mChart.getInspectStart())
.setEndTime(mChart.getInspectEnd())
.setNetworkType(mNetworkType)
.setSubscriptionId(mSubId)
.build();
}
@Override