[MS49] Remove NetworkStats hidden Api usages
This includes: 1. Remove unused INetworkStatsService and NetworkStatsHistory. 2. Replace NetworkTemplate usages with builder. 3. Replace TrafficStats references to DataUnit. 4. Reimplement NetworkTemplate#normalize. Test: make RunSettingsRoboTests Bug: 204830222 Change-Id: I8efecda5df403e9ed588daecd169cb3498d213a2
This commit is contained in:
@@ -18,7 +18,7 @@ package com.android.settings.datausage;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.junit.Assert.assertNull;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyBoolean;
|
||||
import static org.mockito.ArgumentMatchers.anyInt;
|
||||
@@ -438,7 +438,7 @@ public class AppDataUsageTest {
|
||||
|
||||
assertThat(mFragment.mTemplate.getMatchRule())
|
||||
.isEqualTo(NetworkTemplate.MATCH_WIFI);
|
||||
assertNull(mFragment.mTemplate.getSubscriberId());
|
||||
assertTrue(mFragment.mTemplate.getSubscriberIds().isEmpty());
|
||||
assertThat(mFragment.mTemplate.getNetworkId())
|
||||
.isEqualTo(NetworkTemplate.WIFI_NETWORKID_ALL);
|
||||
}
|
||||
|
Reference in New Issue
Block a user