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

Commit f962acdb authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Android (Google) Code Review
Browse files

Merge "Remove dependencies on hidden network stats APIs"

parents b2ac9d5c 0dd1b46f

tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java

+1 −2
Original line number Diff line number Diff line
@@ -439,7 +439,6 @@ public class AppDataUsageTest { 
        assertThat(mFragment.mTemplate.getMatchRule())

                .isEqualTo(NetworkTemplate.MATCH_WIFI);

        assertTrue(mFragment.mTemplate.getSubscriberIds().isEmpty());

        assertThat(mFragment.mTemplate.getNetworkId())

                .isEqualTo(NetworkTemplate.WIFI_NETWORKID_ALL);

        assertTrue(mFragment.mTemplate.getWifiNetworkKeys().isEmpty());

    }

}

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

+6 −6
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ public class DataUsageLibTest { 
        when(mSubscriptionManager.isActiveSubscriptionId(SUB_ID)).thenReturn(false);



        final NetworkTemplate networkTemplate = DataUsageLib.getMobileTemplate(mContext, SUB_ID);

        assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID)).isTrue();

        assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID_2)).isFalse();

        assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID)).isTrue();

        assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID_2)).isFalse();

    }



    @Test
@@ -94,8 +94,8 @@ public class DataUsageLibTest { 
                .thenReturn(new String[] {SUBSCRIBER_ID});



        final NetworkTemplate networkTemplate = DataUsageLib.getMobileTemplate(mContext, SUB_ID);

        assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID)).isTrue();

        assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID_2)).isFalse();

        assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID)).isTrue();

        assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID_2)).isFalse();

    }



    @Test
@@ -107,7 +107,7 @@ public class DataUsageLibTest { 
                .thenReturn(new String[] {SUBSCRIBER_ID, SUBSCRIBER_ID_2});



        final NetworkTemplate networkTemplate = DataUsageLib.getMobileTemplate(mContext, SUB_ID);

        assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID)).isTrue();

        assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID_2)).isTrue();

        assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID)).isTrue();

        assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID_2)).isTrue();

    }

}