diff options
| author | 2020-03-19 17:16:09 +0000 | |
|---|---|---|
| committer | 2020-03-19 17:16:09 +0000 | |
| commit | ca5ea6ca40abeb0babd7b060cd02deadbb398e51 (patch) | |
| tree | 20290a0bc8f4b626823e5a3b0c1849c7b4d4a033 | |
| parent | d0573ac515dd19ca04e08654394184deacf14a1e (diff) | |
| parent | 65c2b809f72a25f38a5fcc605ebf7e60047cf8f9 (diff) | |
Merge "Set metered bit for passpoint networkSuggesiton" into rvc-dev
| -rw-r--r-- | wifi/java/android/net/wifi/WifiNetworkSuggestion.java | 1 | ||||
| -rw-r--r-- | wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/WifiNetworkSuggestion.java b/wifi/java/android/net/wifi/WifiNetworkSuggestion.java index 72ca900f4ecd..4c524f49e4df 100644 --- a/wifi/java/android/net/wifi/WifiNetworkSuggestion.java +++ b/wifi/java/android/net/wifi/WifiNetworkSuggestion.java @@ -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; } diff --git a/wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java b/wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java index 01b2a8d4a24c..ac2f6b26aa00 100644 --- a/wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java +++ b/wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java @@ -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); } |