Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 365c2b16 authored by Nate Jiang's avatar Nate Jiang Committed by Automerger Merge Worker
Browse files

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

Change-Id: I7fe44dd6878b0978d9dab8e453e0a3235b71adfd
parents 9349e948 ca5ea6ca

wifi/java/android/net/wifi/WifiNetworkSuggestion.java

+1 −0
Original line number Diff line number Diff line
@@ -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;

        }

wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java

+2 −0
Original line number Diff line number Diff line
@@ -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);

    }