Merge "Network stats flag to force complete poll."

2011-09-14 21:44:19 -07:00
parent 3b30b92fac d34133cad7
commit 9c57b7f2ef
1 changed files with 1 additions and 0 deletions
--- a/services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java
@@ -758,6 +758,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
        expect(mSettings.getUidMaxHistory()).andReturn(maxHistory).anyTimes();
        expect(mSettings.getTagMaxHistory()).andReturn(maxHistory).anyTimes();
        expect(mSettings.getTimeCacheMaxAge()).andReturn(DAY_IN_MILLIS).anyTimes();
+        expect(mSettings.getForceCompletePoll()).andReturn(false).anyTimes();
    }

    private void expectCurrentTime() throws Exception {