Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19022f69 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Follow API removal." into lmp-mr1-dev 

automerge: d634d39c

* commit 'd634d39c':
  Follow API removal.
parents 9f08a9f0 d634d39c

services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java

+0 −1
Original line number Diff line number Diff line
@@ -932,7 +932,6 @@ public class NetworkStatsServiceTest extends AndroidTestCase { 
        expect(mSettings.getPollInterval()).andReturn(HOUR_IN_MILLIS).anyTimes();

        expect(mSettings.getTimeCacheMaxAge()).andReturn(DAY_IN_MILLIS).anyTimes();

        expect(mSettings.getSampleEnabled()).andReturn(true).anyTimes();

        expect(mSettings.getReportXtOverDev()).andReturn(true).anyTimes();



        final Config config = new Config(bucketDuration, deleteAge, deleteAge);

        expect(mSettings.getDevConfig()).andReturn(config).anyTimes();