Merge "Remove references to @hide MacAddress.ALL_ZEROS_ADDRESS" (87fe40ce) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/SoftApConfiguration.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

+5 −0

Original line number	Diff line number	Diff line
		@@ -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;
		@@ -1186,6 +1187,10 @@ public class WifiManager {
		/** Indicates an invalid SSID. */
		public static final String UNKNOWN_SSID = "<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;

+3 −3

Original line number	Diff line number	Diff line
		@@ -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<MacAddress, MacAddress> MATCH_NO_BSSID_PATTERN1 =
		new Pair(MacAddress.BROADCAST_ADDRESS, MacAddress.BROADCAST_ADDRESS);
		new Pair<>(MacAddress.BROADCAST_ADDRESS, MacAddress.BROADCAST_ADDRESS);
		private static final Pair<MacAddress, MacAddress> 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<MacAddress, MacAddress> 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;

+1 −1

Original line number	Diff line number	Diff line
		@@ -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();

+2 −2

Original line number	Diff line number	Diff line
		@@ -208,7 +208,7 @@ public class WifiNetworkAgentSpecifierTest {
		PatternMatcher ssidPattern =
		new PatternMatcher(TEST_SSID_PATTERN, PatternMatcher.PATTERN_PREFIX);
		Pair<MacAddress, MacAddress> 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<MacAddress, MacAddress> 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);