[SM07] Make combine subtype configurable from Settings am: 678befa63c

Change-Id: I0c3f4a02f16eb6a4d9e48fa775bf456707d2b1bb
This commit is contained in:
junyulai
2020-03-19 09:31:02 +00:00
committed by Automerger Merge Worker

View File

@@ -1294,6 +1294,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
when(mSettings.getPollInterval()).thenReturn(HOUR_IN_MILLIS); when(mSettings.getPollInterval()).thenReturn(HOUR_IN_MILLIS);
when(mSettings.getPollDelay()).thenReturn(0L); when(mSettings.getPollDelay()).thenReturn(0L);
when(mSettings.getSampleEnabled()).thenReturn(true); when(mSettings.getSampleEnabled()).thenReturn(true);
when(mSettings.getCombineSubtypeEnabled()).thenReturn(false);
final Config config = new Config(bucketDuration, deleteAge, deleteAge); final Config config = new Config(bucketDuration, deleteAge, deleteAge);
when(mSettings.getDevConfig()).thenReturn(config); when(mSettings.getDevConfig()).thenReturn(config);