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

Set metered bit for passpoint networkSuggesiton

Browse Source 
Bug: 151672224
Test: atest android.net.wifi
Change-Id: Icc850c37e84c9123ae96abaf377bbf68bd00dae6
This commit is contained in:
Nate Jiang
2020-03-18 15:29:01 -07:00
parent 146db0e46b
commit 65c2b809f7
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wifi/java/android/net/wifi/WifiNetworkSuggestion.java
View File

@@ -577,6 +577,7 @@ public final class WifiNetworkSuggestion implements Parcelable {
: WifiConfiguration.METERED_OVERRIDE_NONE;
wifiConfiguration.trusted = !mIsNetworkUntrusted;
mPasspointConfiguration.setCarrierId(mCarrierId);
mPasspointConfiguration.setMeteredOverride(wifiConfiguration.meteredOverride);
return wifiConfiguration;
}

2
wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java
View File

@@ -297,6 +297,8 @@ public class WifiNetworkSuggestionTest {
assertTrue(suggestion.isAppInteractionRequired);
assertEquals(suggestion.wifiConfiguration.meteredOverride,
WifiConfiguration.METERED_OVERRIDE_METERED);
assertEquals(suggestion.getPasspointConfig().getMeteredOverride(),
WifiConfiguration.METERED_OVERRIDE_METERED);
assertTrue(suggestion.isUserAllowedToManuallyConnect);
}