diff options
author | Jeff Sharkey <jsharkey@android.com> | 2014-10-27 22:01:57 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-27 22:01:58 +0000 |
commit | d634d39c605553e669a16fd8fd406aa4695f54af (patch) | |
tree | 7e0aec422a5d800f2f68b5180dd7e8664b8baf2e /services/tests | |
parent | ac7d8c5cc85dc5929b5d1c9d7836aca58a4e9ea5 (diff) | |
parent | cff1d673394f8ef8c92bb69fea18cef4f7d07959 (diff) | |
download | frameworks_base-d634d39c605553e669a16fd8fd406aa4695f54af.zip frameworks_base-d634d39c605553e669a16fd8fd406aa4695f54af.tar.gz frameworks_base-d634d39c605553e669a16fd8fd406aa4695f54af.tar.bz2 |
Merge "Follow API removal." into lmp-mr1-dev
Diffstat (limited to 'services/tests')
-rw-r--r-- | services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java b/services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java index c3d4ed9..c115339 100644 --- a/services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java @@ -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(); |