Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only write network stats when already loaded." into ics-mr1

Browse Source
This commit is contained in:
Jeff Sharkey
2011-11-17 12:10:02 -08:00
committed by Android (Google) Code Review
parent aefc0ed967 c506ff6150
commit 8ac35e30b2
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/net/NetworkStatsService.java
View File

@@ -203,6 +203,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
/** Set of historical {@code xtables} stats for known UIDs. */ /** Set of historical {@code xtables} stats for known UIDs. */
private HashMap<UidStatsKey, NetworkStatsHistory> mUidStats = Maps.newHashMap(); private HashMap<UidStatsKey, NetworkStatsHistory> mUidStats = Maps.newHashMap();
/** Flag if {@link #mNetworkDevStats} have been loaded from disk. */
private boolean mNetworkStatsLoaded = false;
/** Flag if {@link #mUidStats} have been loaded from disk. */ /** Flag if {@link #mUidStats} have been loaded from disk. */
private boolean mUidStatsLoaded = false; private boolean mUidStatsLoaded = false;
@@ -272,6 +274,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
// until actually needed. // until actually needed.
readNetworkDevStatsLocked(); readNetworkDevStatsLocked();
readNetworkXtStatsLocked(); readNetworkXtStatsLocked();
mNetworkStatsLoaded = true;
} }
// bootstrap initial stats to prevent double-counting later // bootstrap initial stats to prevent double-counting later
@@ -322,14 +325,17 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
mTeleManager.listen(mPhoneListener, LISTEN_NONE); mTeleManager.listen(mPhoneListener, LISTEN_NONE);
writeNetworkDevStatsLocked(); if (mNetworkStatsLoaded) {
writeNetworkXtStatsLocked(); writeNetworkDevStatsLocked();
writeNetworkXtStatsLocked();
}
if (mUidStatsLoaded) { if (mUidStatsLoaded) {
writeUidStatsLocked(); writeUidStatsLocked();
} }
mNetworkDevStats.clear(); mNetworkDevStats.clear();
mNetworkXtStats.clear(); mNetworkXtStats.clear();
mUidStats.clear(); mUidStats.clear();
mNetworkStatsLoaded = false;
mUidStatsLoaded = false; mUidStatsLoaded = false;
} }

9
services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java
View File

@@ -693,12 +693,13 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase {
expectSetInterfaceQuota(TEST_IFACE, Long.MAX_VALUE); expectSetInterfaceQuota(TEST_IFACE, Long.MAX_VALUE);
expectMeteredIfacesChanged(TEST_IFACE); expectMeteredIfacesChanged(TEST_IFACE);
expectClearNotifications(); future = expectClearNotifications();
tagFuture = expectEnqueueNotification(); tagFuture = expectEnqueueNotification();
replay(); replay();
mService.snoozePolicy(sTemplateWifi); mService.snoozePolicy(sTemplateWifi);
assertNotificationType(TYPE_LIMIT_SNOOZED, tagFuture.get()); assertNotificationType(TYPE_LIMIT_SNOOZED, tagFuture.get());
future.get();
verifyAndReset(); verifyAndReset();
} }
} }
@@ -734,9 +735,11 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase {
expectLastCall().atLeastOnce(); expectLastCall().atLeastOnce();
} }
private void expectClearNotifications() throws Exception { private Future<Void> expectClearNotifications() throws Exception {
final FutureAnswer future = new FutureAnswer();
mNotifManager.cancelNotificationWithTag(isA(String.class), isA(String.class), anyInt()); mNotifManager.cancelNotificationWithTag(isA(String.class), isA(String.class), anyInt());
expectLastCall().anyTimes(); expectLastCall().andAnswer(future).anyTimes();
return future;
} }
private Future<String> expectEnqueueNotification() throws Exception { private Future<String> expectEnqueueNotification() throws Exception {