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

Merge "Set metered bit for passpoint networkSuggesiton" into rvc-dev

Browse Source
This commit is contained in:
Nate Jiang
2020-03-19 17:16:09 +00:00
committed by Android (Google) Code Review
parent d0573ac515 65c2b809f7
commit ca5ea6ca40
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);
}