diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2011-09-22 14:59:51 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2011-09-22 16:19:06 -0700 |
| commit | 367d15ab1a33b6159447fa8542d4fa8ff148371c (patch) | |
| tree | ef079cca799aa0e2c68f9a158cfd0a1d533cc253 /services/tests | |
| parent | 745f1e3a06eb504c9e4465afc987854a6269220d (diff) | |
| download | frameworks_base-367d15ab1a33b6159447fa8542d4fa8ff148371c.zip frameworks_base-367d15ab1a33b6159447fa8542d4fa8ff148371c.tar.gz frameworks_base-367d15ab1a33b6159447fa8542d4fa8ff148371c.tar.bz2 | |
Watch network subtype, tethering teardown, empty.
Watch for changes to telephony network subtype, and update iface
mapping to persist stats under correct type. Update network stats
before removing tethering NAT rules.
Skip recording that would create empty historical buckets. Query UID
stats before iface stats to always skew positive when counters are
actively rolling forward.
Bug: 5360042, 5359860, 5335674, 5334448
Change-Id: I8aa37b568e8ffb70647218aa1aff5195d3e44d5a
Diffstat (limited to 'services/tests')
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java b/services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java index 99ae027..2ead254 100644 --- a/services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java @@ -776,6 +776,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase { private void expectNetworkStatsPoll() throws Exception { mNetManager.setGlobalAlert(anyLong()); expectLastCall().anyTimes(); + expect(mConnManager.getTetheredIfacePairs()).andReturn(null).anyTimes(); } private void assertStatsFilesExist(boolean exist) { |