From 4351857f97c6afad417acbb79ec28b6a8a0cc07e Mon Sep 17 00:00:00 2001 From: David Su Date: Wed, 4 Dec 2019 11:35:50 -0800 Subject: [PATCH] Remove references to @hide MacAddress.ALL_ZEROS_ADDRESS Migrate to WifiManager.ALL_ZEROS_MAC_ADDRESS. Bug: 145409537 Test: atest FrameworksWifiApiTests Change-Id: I6203be94847e962ba87b97d1e5b4777678b7886a --- .../java/android/net/wifi/SoftApConfiguration.java | 2 +- wifi/java/android/net/wifi/WifiManager.java | 5 +++++ .../android/net/wifi/WifiNetworkSpecifier.java | 6 +++--- .../android/net/wifi/WifiNetworkSuggestion.java | 2 +- .../net/wifi/WifiNetworkAgentSpecifierTest.java | 4 ++-- .../android/net/wifi/WifiNetworkSpecifierTest.java | 14 +++++++++----- .../net/wifi/WifiNetworkSuggestionTest.java | 2 +- 7 files changed, 22 insertions(+), 13 deletions(-) diff --git a/wifi/java/android/net/wifi/SoftApConfiguration.java b/wifi/java/android/net/wifi/SoftApConfiguration.java index 8030bd66e313d..d755053e60d27 100644 --- a/wifi/java/android/net/wifi/SoftApConfiguration.java +++ b/wifi/java/android/net/wifi/SoftApConfiguration.java @@ -388,7 +388,7 @@ public final class SoftApConfiguration implements Parcelable { @NonNull public Builder setBssid(@Nullable MacAddress bssid) { if (bssid != null) { - Preconditions.checkArgument(!bssid.equals(MacAddress.ALL_ZEROS_ADDRESS)); + Preconditions.checkArgument(!bssid.equals(WifiManager.ALL_ZEROS_MAC_ADDRESS)); Preconditions.checkArgument(!bssid.equals(MacAddress.BROADCAST_ADDRESS)); } mBssid = bssid; diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 83bba27e48a20..2a95316fd071d 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -35,6 +35,7 @@ import android.content.Context; import android.content.pm.ParceledListSlice; import android.net.ConnectivityManager; import android.net.DhcpInfo; +import android.net.MacAddress; import android.net.Network; import android.net.NetworkStack; import android.net.wifi.hotspot2.IProvisioningCallback; @@ -1184,6 +1185,10 @@ public class WifiManager { /** Indicates an invalid SSID. */ public static final String UNKNOWN_SSID = ""; + /** @hide */ + public static final MacAddress ALL_ZEROS_MAC_ADDRESS = + MacAddress.fromString("00:00:00:00:00:00"); + /* Number of currently active WifiLocks and MulticastLocks */ @UnsupportedAppUsage private int mActiveLockCount; diff --git a/wifi/java/android/net/wifi/WifiNetworkSpecifier.java b/wifi/java/android/net/wifi/WifiNetworkSpecifier.java index ba9dd37398a14..07afd7fb6714d 100644 --- a/wifi/java/android/net/wifi/WifiNetworkSpecifier.java +++ b/wifi/java/android/net/wifi/WifiNetworkSpecifier.java @@ -49,11 +49,11 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc private static final String MATCH_ALL_SSID_PATTERN_PATH = ".*"; private static final String MATCH_EMPTY_SSID_PATTERN_PATH = ""; private static final Pair MATCH_NO_BSSID_PATTERN1 = - new Pair(MacAddress.BROADCAST_ADDRESS, MacAddress.BROADCAST_ADDRESS); + new Pair<>(MacAddress.BROADCAST_ADDRESS, MacAddress.BROADCAST_ADDRESS); private static final Pair MATCH_NO_BSSID_PATTERN2 = - new Pair(MacAddress.ALL_ZEROS_ADDRESS, MacAddress.BROADCAST_ADDRESS); + new Pair<>(WifiManager.ALL_ZEROS_MAC_ADDRESS, MacAddress.BROADCAST_ADDRESS); private static final Pair MATCH_ALL_BSSID_PATTERN = - new Pair(MacAddress.ALL_ZEROS_ADDRESS, MacAddress.ALL_ZEROS_ADDRESS); + new Pair<>(WifiManager.ALL_ZEROS_MAC_ADDRESS, WifiManager.ALL_ZEROS_MAC_ADDRESS); private static final MacAddress MATCH_EXACT_BSSID_PATTERN_MASK = MacAddress.BROADCAST_ADDRESS; diff --git a/wifi/java/android/net/wifi/WifiNetworkSuggestion.java b/wifi/java/android/net/wifi/WifiNetworkSuggestion.java index a5ca82c50627b..e78104d3da386 100644 --- a/wifi/java/android/net/wifi/WifiNetworkSuggestion.java +++ b/wifi/java/android/net/wifi/WifiNetworkSuggestion.java @@ -545,7 +545,7 @@ public final class WifiNetworkSuggestion implements Parcelable { } if (mBssid != null && (mBssid.equals(MacAddress.BROADCAST_ADDRESS) - || mBssid.equals(MacAddress.ALL_ZEROS_ADDRESS))) { + || mBssid.equals(WifiManager.ALL_ZEROS_MAC_ADDRESS))) { throw new IllegalStateException("invalid bssid for suggestion"); } wifiConfiguration = buildWifiConfiguration(); diff --git a/wifi/tests/src/android/net/wifi/WifiNetworkAgentSpecifierTest.java b/wifi/tests/src/android/net/wifi/WifiNetworkAgentSpecifierTest.java index e6eece85cb195..adc41f0df4b4d 100644 --- a/wifi/tests/src/android/net/wifi/WifiNetworkAgentSpecifierTest.java +++ b/wifi/tests/src/android/net/wifi/WifiNetworkAgentSpecifierTest.java @@ -208,7 +208,7 @@ public class WifiNetworkAgentSpecifierTest { PatternMatcher ssidPattern = new PatternMatcher(TEST_SSID_PATTERN, PatternMatcher.PATTERN_PREFIX); Pair bssidPattern = - Pair.create(MacAddress.ALL_ZEROS_ADDRESS, MacAddress.ALL_ZEROS_ADDRESS); + Pair.create(WifiManager.ALL_ZEROS_MAC_ADDRESS, WifiManager.ALL_ZEROS_MAC_ADDRESS); WifiConfiguration wificonfigurationNetworkSpecifier = new WifiConfiguration(); wificonfigurationNetworkSpecifier.allowedKeyManagement .set(WifiConfiguration.KeyMgmt.WPA_PSK); @@ -299,7 +299,7 @@ public class WifiNetworkAgentSpecifierTest { PatternMatcher ssidPattern = new PatternMatcher(TEST_SSID_PATTERN, PatternMatcher.PATTERN_PREFIX); Pair bssidPattern = - Pair.create(MacAddress.ALL_ZEROS_ADDRESS, MacAddress.ALL_ZEROS_ADDRESS); + Pair.create(WifiManager.ALL_ZEROS_MAC_ADDRESS, WifiManager.ALL_ZEROS_MAC_ADDRESS); WifiConfiguration wificonfigurationNetworkSpecifier = new WifiConfiguration(); wificonfigurationNetworkSpecifier.allowedKeyManagement .set(WifiConfiguration.KeyMgmt.WPA_PSK); diff --git a/wifi/tests/src/android/net/wifi/WifiNetworkSpecifierTest.java b/wifi/tests/src/android/net/wifi/WifiNetworkSpecifierTest.java index edb43d8bdf526..16197443b9d9f 100644 --- a/wifi/tests/src/android/net/wifi/WifiNetworkSpecifierTest.java +++ b/wifi/tests/src/android/net/wifi/WifiNetworkSpecifierTest.java @@ -65,8 +65,10 @@ public class WifiNetworkSpecifierTest { assertEquals(Process.myUid(), wifiNetworkSpecifier.requestorUid); assertEquals(TEST_SSID, wifiNetworkSpecifier.ssidPatternMatcher.getPath()); assertEquals(PATTERN_PREFIX, wifiNetworkSpecifier.ssidPatternMatcher.getType()); - assertEquals(MacAddress.ALL_ZEROS_ADDRESS, wifiNetworkSpecifier.bssidPatternMatcher.first); - assertEquals(MacAddress.ALL_ZEROS_ADDRESS, wifiNetworkSpecifier.bssidPatternMatcher.second); + assertEquals(WifiManager.ALL_ZEROS_MAC_ADDRESS, + wifiNetworkSpecifier.bssidPatternMatcher.first); + assertEquals(WifiManager.ALL_ZEROS_MAC_ADDRESS, + wifiNetworkSpecifier.bssidPatternMatcher.second); assertTrue(wifiNetworkSpecifier.wifiConfiguration.allowedKeyManagement .get(WifiConfiguration.KeyMgmt.NONE)); } @@ -210,7 +212,8 @@ public class WifiNetworkSpecifierTest { @Test(expected = IllegalStateException.class) public void testWifiNetworkSpecifierBuilderWithMatchAllBssidPattern() { new WifiNetworkSpecifier.Builder() - .setBssidPattern(MacAddress.ALL_ZEROS_ADDRESS, MacAddress.ALL_ZEROS_ADDRESS) + .setBssidPattern(WifiManager.ALL_ZEROS_MAC_ADDRESS, + WifiManager.ALL_ZEROS_MAC_ADDRESS) .build(); } @@ -265,7 +268,7 @@ public class WifiNetworkSpecifierTest { @Test(expected = IllegalStateException.class) public void testWifiNetworkSpecifierBuilderWithMatchNoneBssidPattern3() { new WifiNetworkSpecifier.Builder() - .setBssid(MacAddress.ALL_ZEROS_ADDRESS) + .setBssid(WifiManager.ALL_ZEROS_MAC_ADDRESS) .build(); } @@ -513,7 +516,8 @@ public class WifiNetworkSpecifierTest { WifiNetworkSpecifier specifier2 = new WifiNetworkSpecifier(new PatternMatcher(TEST_SSID, PATTERN_LITERAL), - Pair.create(MacAddress.ALL_ZEROS_ADDRESS, MacAddress.ALL_ZEROS_ADDRESS), + Pair.create(WifiManager.ALL_ZEROS_MAC_ADDRESS, + WifiManager.ALL_ZEROS_MAC_ADDRESS), wifiConfiguration, TEST_UID, TEST_PACKAGE_NAME); diff --git a/wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java b/wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java index ce085f55b0dd0..8a5a0fd6805b8 100644 --- a/wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java +++ b/wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java @@ -294,7 +294,7 @@ public class WifiNetworkSuggestionTest { public void testWifiNetworkSuggestionBuilderWithInvalidAllZeroBssid() { new WifiNetworkSuggestion.Builder() .setSsid(TEST_SSID) - .setBssid(MacAddress.ALL_ZEROS_ADDRESS) + .setBssid(WifiManager.ALL_ZEROS_MAC_ADDRESS) .build(); }