diff options
Diffstat (limited to 'wifi/java')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiInfo.java | 9 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiNetworkSuggestion.java | 22 |
2 files changed, 18 insertions, 13 deletions
diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java index 70c5e72e4e0c..b841921355e9 100644 --- a/wifi/java/android/net/wifi/WifiInfo.java +++ b/wifi/java/android/net/wifi/WifiInfo.java @@ -632,7 +632,6 @@ public class WifiInfo implements Parcelable { /** * @hide - * TODO: makes real freq boundaries */ public boolean is24GHz() { return ScanResult.is24GHz(mFrequency); @@ -640,7 +639,6 @@ public class WifiInfo implements Parcelable { /** * @hide - * TODO: makes real freq boundaries */ @UnsupportedAppUsage public boolean is5GHz() { @@ -648,6 +646,13 @@ public class WifiInfo implements Parcelable { } /** + * @hide + */ + public boolean is6GHz() { + return ScanResult.is6GHz(mFrequency); + } + + /** * Record the MAC address of the WLAN interface * @param macAddress the MAC address in {@code XX:XX:XX:XX:XX:XX} form * @hide diff --git a/wifi/java/android/net/wifi/WifiNetworkSuggestion.java b/wifi/java/android/net/wifi/WifiNetworkSuggestion.java index cedf9b0b872d..8c494943200f 100644 --- a/wifi/java/android/net/wifi/WifiNetworkSuggestion.java +++ b/wifi/java/android/net/wifi/WifiNetworkSuggestion.java @@ -100,7 +100,7 @@ public final class WifiNetworkSuggestion implements Parcelable { /** * Whether this network is metered or not. */ - private boolean mIsMetered; + private int mMeteredOverride; /** * Priority of this network among other network suggestions provided by the app. * The lower the number, the higher the priority (i.e value of 0 = highest priority). @@ -156,7 +156,7 @@ public final class WifiNetworkSuggestion implements Parcelable { mIsHiddenSSID = false; mIsAppInteractionRequired = false; mIsUserInteractionRequired = false; - mIsMetered = false; + mMeteredOverride = WifiConfiguration.METERED_OVERRIDE_NONE; mIsSharedWithUser = true; mIsSharedWithUserSet = false; mIsInitialAutojoinEnabled = true; @@ -421,14 +421,18 @@ public final class WifiNetworkSuggestion implements Parcelable { /** * Specifies whether this network is metered. * <p> - * <li>If not set, defaults to false (i.e not metered).</li> + * <li>If not set, defaults to detect automatically.</li> * * @param isMetered {@code true} to indicate that the network is metered, {@code false} - * otherwise. + * for not metered. * @return Instance of {@link Builder} to enable chaining of the builder method. */ public @NonNull Builder setIsMetered(boolean isMetered) { - mIsMetered = isMetered; + if (isMetered) { + mMeteredOverride = WifiConfiguration.METERED_OVERRIDE_METERED; + } else { + mMeteredOverride = WifiConfiguration.METERED_OVERRIDE_NOT_METERED; + } return this; } @@ -541,9 +545,7 @@ public final class WifiNetworkSuggestion implements Parcelable { wifiConfiguration.hiddenSSID = mIsHiddenSSID; wifiConfiguration.priority = mPriority; - wifiConfiguration.meteredOverride = - mIsMetered ? WifiConfiguration.METERED_OVERRIDE_METERED - : WifiConfiguration.METERED_OVERRIDE_NOT_METERED; + wifiConfiguration.meteredOverride = mMeteredOverride; wifiConfiguration.carrierId = mCarrierId; wifiConfiguration.trusted = !mIsNetworkUntrusted; return wifiConfiguration; @@ -572,9 +574,7 @@ public final class WifiNetworkSuggestion implements Parcelable { wifiConfiguration.FQDN = mPasspointConfiguration.getHomeSp().getFqdn(); wifiConfiguration.setPasspointUniqueId(mPasspointConfiguration.getUniqueId()); wifiConfiguration.priority = mPriority; - wifiConfiguration.meteredOverride = - mIsMetered ? WifiConfiguration.METERED_OVERRIDE_METERED - : WifiConfiguration.METERED_OVERRIDE_NONE; + wifiConfiguration.meteredOverride = mMeteredOverride; wifiConfiguration.trusted = !mIsNetworkUntrusted; mPasspointConfiguration.setCarrierId(mCarrierId); mPasspointConfiguration.setMeteredOverride(wifiConfiguration.meteredOverride); |