diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-12-04 21:43:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-12-04 21:43:03 +0000 |
| commit | 27fc5ec251e42b45094604e03c578243b69d3e91 (patch) | |
| tree | c798c35be42766ac8a01b7e450570d5784fd1d45 /service | |
| parent | 9a090f9497b92cceece5ed493644855d6348fc0b (diff) | |
| parent | dd67b710d037fa23a35de33814ba40bb9765f5bf (diff) | |
Merge "Remove references to @hide MacAddress.ALL_ZEROS_ADDRESS"
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigurationUtil.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigurationUtil.java b/service/java/com/android/server/wifi/WifiConfigurationUtil.java index 1bff474e4..09674ecef 100644 --- a/service/java/com/android/server/wifi/WifiConfigurationUtil.java +++ b/service/java/com/android/server/wifi/WifiConfigurationUtil.java @@ -16,6 +16,8 @@ package com.android.server.wifi; +import static android.net.wifi.WifiManager.ALL_ZEROS_MAC_ADDRESS; + import static com.android.server.wifi.util.NativeUtil.addEnclosingQuotes; import android.net.IpConfiguration; @@ -62,15 +64,14 @@ public class WifiConfigurationUtil { private static final int SAE_ASCII_MIN_LEN = 1 + ENCLOSING_QUOTES_LEN; private static final int PSK_SAE_ASCII_MAX_LEN = 63 + ENCLOSING_QUOTES_LEN; private static final int PSK_SAE_HEX_LEN = 64; - private static final MacAddress ALL_ZEROS_MAC_ADDRESS = - MacAddress.fromString("00:00:00:00:00:00"); + @VisibleForTesting public static final String PASSWORD_MASK = "*"; private static final String MATCH_EMPTY_SSID_PATTERN_PATH = ""; private static final Pair<MacAddress, MacAddress> MATCH_NONE_BSSID_PATTERN = - new Pair(MacAddress.BROADCAST_ADDRESS, MacAddress.BROADCAST_ADDRESS); + new Pair<>(MacAddress.BROADCAST_ADDRESS, MacAddress.BROADCAST_ADDRESS); private static final Pair<MacAddress, MacAddress> MATCH_ALL_BSSID_PATTERN = - new Pair(ALL_ZEROS_MAC_ADDRESS, ALL_ZEROS_MAC_ADDRESS); + new Pair<>(ALL_ZEROS_MAC_ADDRESS, ALL_ZEROS_MAC_ADDRESS); /** * Checks if the provided |wepKeys| array contains any non-null value; |