PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove dependencies on hidden network stats APIs"

Browse Source
This commit is contained in:
Remi NGUYEN VAN
2022-02-07 05:36:49 +00:00
committed by Android (Google) Code Review
parent b2ac9d5c9f 0dd1b46fcf
commit f962acdb70
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
View File

@@ -439,7 +439,6 @@ public class AppDataUsageTest {
assertThat(mFragment.mTemplate.getMatchRule()) assertThat(mFragment.mTemplate.getMatchRule())
.isEqualTo(NetworkTemplate.MATCH_WIFI); .isEqualTo(NetworkTemplate.MATCH_WIFI);
assertTrue(mFragment.mTemplate.getSubscriberIds().isEmpty()); assertTrue(mFragment.mTemplate.getSubscriberIds().isEmpty());
assertThat(mFragment.mTemplate.getNetworkId()) assertTrue(mFragment.mTemplate.getWifiNetworkKeys().isEmpty());
.isEqualTo(NetworkTemplate.WIFI_NETWORKID_ALL);
} }
} }

12
tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java
View File

@@ -81,8 +81,8 @@ public class DataUsageLibTest {
when(mSubscriptionManager.isActiveSubscriptionId(SUB_ID)).thenReturn(false); when(mSubscriptionManager.isActiveSubscriptionId(SUB_ID)).thenReturn(false);
final NetworkTemplate networkTemplate = DataUsageLib.getMobileTemplate(mContext, SUB_ID); final NetworkTemplate networkTemplate = DataUsageLib.getMobileTemplate(mContext, SUB_ID);
assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID)).isTrue(); assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID)).isTrue();
assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID_2)).isFalse(); assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID_2)).isFalse();
} }
@Test @Test
@@ -94,8 +94,8 @@ public class DataUsageLibTest {
.thenReturn(new String[] {SUBSCRIBER_ID}); .thenReturn(new String[] {SUBSCRIBER_ID});
final NetworkTemplate networkTemplate = DataUsageLib.getMobileTemplate(mContext, SUB_ID); final NetworkTemplate networkTemplate = DataUsageLib.getMobileTemplate(mContext, SUB_ID);
assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID)).isTrue(); assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID)).isTrue();
assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID_2)).isFalse(); assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID_2)).isFalse();
} }
@Test @Test
@@ -107,7 +107,7 @@ public class DataUsageLibTest {
.thenReturn(new String[] {SUBSCRIBER_ID, SUBSCRIBER_ID_2}); .thenReturn(new String[] {SUBSCRIBER_ID, SUBSCRIBER_ID_2});
final NetworkTemplate networkTemplate = DataUsageLib.getMobileTemplate(mContext, SUB_ID); final NetworkTemplate networkTemplate = DataUsageLib.getMobileTemplate(mContext, SUB_ID);
assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID)).isTrue(); assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID)).isTrue();
assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID_2)).isTrue(); assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID_2)).isTrue();
} }
} }