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 am: ca5ea6ca40

Browse Source 
Change-Id: I7fe44dd6878b0978d9dab8e453e0a3235b71adfd
This commit is contained in:
Nate Jiang
2020-03-19 17:25:09 +00:00
committed by Automerger Merge Worker
parent 9349e94816 ca5ea6ca40
commit 365c2b1697
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.METERED_OVERRIDE_NONE;
wifiConfiguration.trusted = !mIsNetworkUntrusted; wifiConfiguration.trusted = !mIsNetworkUntrusted;
mPasspointConfiguration.setCarrierId(mCarrierId); mPasspointConfiguration.setCarrierId(mCarrierId);
mPasspointConfiguration.setMeteredOverride(wifiConfiguration.meteredOverride);
return wifiConfiguration; return wifiConfiguration;
} }

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

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