Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove references to @hide MacAddress.ALL_ZEROS_ADDRESS"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-12-04 21:43:03 +00:00
committed by Android (Google) Code Review
parent 2a0d07156f 4351857f97
commit 87fe40ced8
7 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wifi/java/android/net/wifi/SoftApConfiguration.java
View File

@@ -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
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -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;

6
wifi/java/android/net/wifi/WifiNetworkSpecifier.java
View File

@@ -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;

2
wifi/java/android/net/wifi/WifiNetworkSuggestion.java
View File

@@ -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();

4
wifi/tests/src/android/net/wifi/WifiNetworkAgentSpecifierTest.java
View File

@@ -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);

14
wifi/tests/src/android/net/wifi/WifiNetworkSpecifierTest.java
View File

@@ -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);

2
wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java
View File

@@ -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();
}