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

Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages" am: 0ccb8750b9 am: 039cdfd764 am: 5ea82e5955 am: b21993b793

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943134

Change-Id: I4fe5dfdfc66aaad72a31de1761c28c6245db5bd6
This commit is contained in:
Treehugger Robot
2022-01-11 10:51:15 +00:00
committed by Automerger Merge Worker
parent 37495f25cb b21993b793
commit 61e1a07529
14 changed files with 53 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/unit/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
View File

@@ -101,8 +101,7 @@ public class DataUsageInfoControllerTest {
}
private NetworkPolicy getDefaultNetworkPolicy() {
NetworkTemplate template = NetworkTemplate.buildTemplateWifi(
NetworkTemplate.WIFI_NETWORKID_ALL, null /* subscriberId */);
NetworkTemplate template = new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build();
int cycleDay = -1;
String cycleTimezone = "UTC";
long warningBytes = -1;

6
tests/unit/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
View File

@@ -531,13 +531,11 @@ public class DataUsageSummaryPreferenceTest {
final Bundle expect = new Bundle(1);
expect.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE,
NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
null /* subscriberId */));
new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build());
final Bundle actual = startedIntent
.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS);
assertThat((NetworkTemplate) actual.getParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE))
.isEqualTo(NetworkTemplate.buildTemplateWifi(
NetworkTemplate.WIFI_NETWORKID_ALL, null /* subscriberId */));
.isEqualTo(new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build());
assertThat(startedIntent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))
.isEqualTo(ResourcesUtils.getResourcesId(mContext, "string", "wifi_data_usage"));