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

Merge "Follow API removal." into lmp-mr1-dev automerge: d634d39

Browse Source 
automerge: 19022f6

* commit '19022f6991e2d681dfdc8d5e6464557647a1faa1':
  Follow API removal.
This commit is contained in:
Jeff Sharkey
2014-10-28 00:31:14 +00:00
committed by android-build-merger
parent bfdc6b50f4 19022f6991
commit 720147e249
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java
View File

@@ -932,7 +932,6 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
expect(mSettings.getPollInterval()).andReturn(HOUR_IN_MILLIS).anyTimes(); expect(mSettings.getPollInterval()).andReturn(HOUR_IN_MILLIS).anyTimes();
expect(mSettings.getTimeCacheMaxAge()).andReturn(DAY_IN_MILLIS).anyTimes(); expect(mSettings.getTimeCacheMaxAge()).andReturn(DAY_IN_MILLIS).anyTimes();
expect(mSettings.getSampleEnabled()).andReturn(true).anyTimes(); expect(mSettings.getSampleEnabled()).andReturn(true).anyTimes();
expect(mSettings.getReportXtOverDev()).andReturn(true).anyTimes();
final Config config = new Config(bucketDuration, deleteAge, deleteAge); final Config config = new Config(bucketDuration, deleteAge, deleteAge);
expect(mSettings.getDevConfig()).andReturn(config).anyTimes(); expect(mSettings.getDevConfig()).andReturn(config).anyTimes();