From dd67b710d037fa23a35de33814ba40bb9765f5bf Mon Sep 17 00:00:00 2001 From: David Su Date: Wed, 4 Dec 2019 11:34:40 -0800 Subject: Remove references to @hide MacAddress.ALL_ZEROS_ADDRESS Migrate to WifiManager.ALL_ZEROS_MAC_ADDRESS. Bug: 145409537 Test: atest FrameworksWifiTests Change-Id: I88027bcb49bed6977a42f5bf107bf3fd36cfe868 --- service/java/com/android/server/wifi/WifiConfigurationUtil.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'service') 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 MATCH_NONE_BSSID_PATTERN = - new Pair(MacAddress.BROADCAST_ADDRESS, MacAddress.BROADCAST_ADDRESS); + new Pair<>(MacAddress.BROADCAST_ADDRESS, MacAddress.BROADCAST_ADDRESS); private static final Pair 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; -- cgit v1.2.3