Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "network_policy_for_supporting_merged_wifi" into sc-dev am: 7b4645f35e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14782680

Change-Id: I2b60f1d9a4012866f4d22a4e7a2b20610576d7be
This commit is contained in:
Les Lee
2021-06-02 04:01:18 +00:00
committed by Automerger Merge Worker
parent c23f868643 7b4645f35e
commit a17cdbab05
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsLib/src/com/android/settingslib/net/DataUsageUtils.java
View File

@@ -73,6 +73,7 @@ public class DataUsageUtils {
private static NetworkTemplate getMobileTemplateForSubId(
TelephonyManager telephonyManager, int subId) {
return NetworkTemplate.buildTemplateMobileAll(telephonyManager.getSubscriberId(subId));
return NetworkTemplate.buildTemplateCarrierMetered(
telephonyManager.getSubscriberId(subId));
}
}

2
packages/SettingsLib/tests/integ/src/com/android/settingslib/utils/NetworkPolicyEditorTest.java
View File

@@ -44,7 +44,7 @@ public class NetworkPolicyEditorTest {
@Before
public void setUp() {
mNetworkTemplate = NetworkTemplate.buildTemplateMobileAll("123456789123456");
mNetworkTemplate = NetworkTemplate.buildTemplateCarrierMetered("123456789123456");
NetworkPolicyManager policyManager = NetworkPolicyManager.from(InstrumentationRegistry
.getContext());
mNetworkPolicyEditor = new NetworkPolicyEditor(policyManager);

4
packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageControllerTest.java
View File

@@ -87,8 +87,8 @@ public class DataUsageControllerTest {
ShadowSubscriptionManager.setDefaultDataSubscriptionId(mDefaultSubscriptionId);
doReturn(SUB_ID).when(mTelephonyManager).getSubscriberId();
mNetworkTemplate = NetworkTemplate.buildTemplateMobileAll(SUB_ID);
mNetworkTemplate2 = NetworkTemplate.buildTemplateMobileAll(SUB_ID_2);
mNetworkTemplate = NetworkTemplate.buildTemplateCarrierMetered(SUB_ID);
mNetworkTemplate2 = NetworkTemplate.buildTemplateCarrierMetered(SUB_ID_2);
mWifiNetworkTemplate = NetworkTemplate.buildTemplateWifi(
NetworkTemplate.WIFI_NETWORKID_ALL, null);
}

2
packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/NetworkCycleDataForUidLoaderTest.java
View File

@@ -62,7 +62,7 @@ public class NetworkCycleDataForUidLoaderTest {
when(mContext.getSystemService(Context.NETWORK_POLICY_SERVICE))
.thenReturn(mNetworkPolicyManager);
when(mNetworkPolicyManager.getNetworkPolicies()).thenReturn(new NetworkPolicy[0]);
mNetworkTemplate = NetworkTemplate.buildTemplateMobileAll(SUB_ID);
mNetworkTemplate = NetworkTemplate.buildTemplateCarrierMetered(SUB_ID);
}
@Test