From 65c2b809f72a25f38a5fcc605ebf7e60047cf8f9 Mon Sep 17 00:00:00 2001 From: Nate Jiang Date: Wed, 18 Mar 2020 15:29:01 -0700 Subject: Set metered bit for passpoint networkSuggesiton Bug: 151672224 Test: atest android.net.wifi Change-Id: Icc850c37e84c9123ae96abaf377bbf68bd00dae6 --- wifi/java/android/net/wifi/WifiNetworkSuggestion.java | 1 + wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java | 2 ++ 2 files changed, 3 insertions(+) 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); } -- cgit v1.2.3-59-g8ed1b