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

Migrate to refactored NetworkStats API.

Browse Source 
Change-Id: I76452a67b74df873c88cb9092188e5e4ba83b991
This commit is contained in:
Jeff Sharkey
2011-07-12 13:53:11 -07:00
parent 078b435743
commit ebae659fc7
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/DataUsageSummary.java
View File

@@ -745,9 +745,13 @@ public class DataUsageSummary extends Fragment {
long start = currentTime; long start = currentTime;
long end = currentTime; long end = currentTime;
if (history.bucketCount > 0) {
start = history.bucketStart[0]; NetworkStatsHistory.Entry entry = null;
end = history.bucketStart[history.bucketCount - 1]; if (history.size() > 0) {
entry = history.getValues(0, entry);
start = entry.bucketStart;
entry = history.getValues(history.size() - 1, entry);
end = entry.bucketStart + entry.bucketDuration;
} }
return new long[] { start, end }; return new long[] { start, end };
@@ -1081,11 +1085,12 @@ public class DataUsageSummary extends Fragment {
mItems.clear(); mItems.clear();
if (stats != null) { if (stats != null) {
for (int i = 0; i < stats.size; i++) { NetworkStats.Entry entry = null;
final long total = stats.rx[i] + stats.tx[i]; for (int i = 0; i < stats.size(); i++) {
entry = stats.getValues(i, entry);
final AppUsageItem item = new AppUsageItem(); final AppUsageItem item = new AppUsageItem();
item.uid = stats.uid[i]; item.uid = entry.uid;
item.total = total; item.total = entry.rxBytes + entry.txBytes;
mItems.add(item); mItems.add(item);
} }
} }

11
src/com/android/settings/widget/ChartNetworkSeriesView.java
View File

@@ -140,7 +140,7 @@ public class ChartNetworkSeriesView extends View {
mPathFill.reset(); mPathFill.reset();
// bail when not enough stats to render // bail when not enough stats to render
if (mStats == null || mStats.bucketCount < 2) return; if (mStats == null || mStats.size() < 2) return;
final int width = getWidth(); final int width = getWidth();
final int height = getHeight(); final int height = getHeight();
@@ -155,8 +155,11 @@ public class ChartNetworkSeriesView extends View {
long totalData = 0; long totalData = 0;
for (int i = 0; i < mStats.bucketCount; i++) { NetworkStatsHistory.Entry entry = null;
final float x = mHoriz.convertToPoint(mStats.bucketStart[i]); for (int i = 0; i < mStats.size(); i++) {
entry = mStats.getValues(i, entry);
final float x = mHoriz.convertToPoint(entry.bucketStart);
final float y = mVert.convertToPoint(totalData); final float y = mVert.convertToPoint(totalData);
// skip until we find first stats on screen // skip until we find first stats on screen
@@ -170,7 +173,7 @@ public class ChartNetworkSeriesView extends View {
if (started) { if (started) {
mPathStroke.lineTo(x, y); mPathStroke.lineTo(x, y);
mPathFill.lineTo(x, y); mPathFill.lineTo(x, y);
totalData += mStats.rx[i] + mStats.tx[i]; totalData += entry.rxBytes + entry.txBytes;
} }
// skip if beyond view // skip if beyond view