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

Merge "WifiNetworkSpecifier: Ensure we don't match a regular wifi network" into rvc-dev am: c524ad59f3 am: 890252cbbf am: 26789cc723

Browse Source 
Change-Id: Iee7453da0adaba21e47f7051778a06af406b996a
This commit is contained in:
TreeHugger Robot
2020-04-07 14:10:36 +00:00
committed by Automerger Merge Worker
parent 1523435934 26789cc723
commit 3e2c8372cb
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,6 @@ import static com.android.internal.util.Preconditions.checkNotNull;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.net.MacAddress; import android.net.MacAddress;
import android.net.MatchAllNetworkSpecifier;
import android.net.NetworkRequest; import android.net.NetworkRequest;
import android.net.NetworkSpecifier; import android.net.NetworkSpecifier;
import android.os.Parcel; import android.os.Parcel;
@@ -553,13 +552,6 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc
/** @hide */ /** @hide */
@Override @Override
public boolean canBeSatisfiedBy(NetworkSpecifier other) { public boolean canBeSatisfiedBy(NetworkSpecifier other) {
if (this == other) {
return true;
}
// Any generic requests should be satisifed by a specific wifi network.
if (other == null || other instanceof MatchAllNetworkSpecifier) {
return true;
}
if (other instanceof WifiNetworkAgentSpecifier) { if (other instanceof WifiNetworkAgentSpecifier) {
return ((WifiNetworkAgentSpecifier) other).satisfiesNetworkSpecifier(this); return ((WifiNetworkAgentSpecifier) other).satisfiesNetworkSpecifier(this);
} }

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

@@ -382,11 +382,11 @@ public class WifiNetworkSpecifierTest {
/** /**
* Validate NetworkSpecifier matching. * Validate NetworkSpecifier matching.
* a) Create a network specifier for WPA_PSK network * a) Create a network specifier for WPA_PSK network
* b) Ensure that the specifier matches {@code null} and {@link MatchAllNetworkSpecifier} * b) Ensure that the specifier does not match {@code null} and {@link MatchAllNetworkSpecifier}
* specifiers. * specifiers.
*/ */
@Test @Test
public void testWifiNetworkSpecifierSatisfiesNullAndAllMatch() { public void testWifiNetworkSpecifierDoesNotSatisfyNullAndAllMatch() {
WifiConfiguration wifiConfiguration = new WifiConfiguration(); WifiConfiguration wifiConfiguration = new WifiConfiguration();
wifiConfiguration.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK); wifiConfiguration.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
wifiConfiguration.preSharedKey = TEST_PRESHARED_KEY; wifiConfiguration.preSharedKey = TEST_PRESHARED_KEY;
@@ -396,8 +396,8 @@ public class WifiNetworkSpecifierTest {
MacAddress.fromString(TEST_BSSID_OUI_MASK)), MacAddress.fromString(TEST_BSSID_OUI_MASK)),
wifiConfiguration); wifiConfiguration);
assertTrue(specifier.canBeSatisfiedBy(null)); assertFalse(specifier.canBeSatisfiedBy(null));
assertTrue(specifier.canBeSatisfiedBy(new MatchAllNetworkSpecifier())); assertFalse(specifier.canBeSatisfiedBy(new MatchAllNetworkSpecifier()));
} }
/** /**