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

Commit ca5ea6ca authored by Nate Jiang's avatar Nate Jiang Committed by Android (Google) Code Review
Browse files

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

parents d0573ac5 65c2b809

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

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

        }

        }

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

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

    }

    }