Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1c496b4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "WifiNetworkSpecifier: Ensure we don't match a regular wifi network"... 

Merge "WifiNetworkSpecifier: Ensure we don't match a regular wifi network" into rvc-dev am: c524ad59

Change-Id: Ib7422357436b7849dd5e4119521287b70aab0ffe
parents 63b3c143 c524ad59

wifi/java/android/net/wifi/WifiNetworkSpecifier.java

+0 −8
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static com.android.internal.util.Preconditions.checkNotNull; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.net.MacAddress;

import android.net.MatchAllNetworkSpecifier;

import android.net.NetworkRequest;

import android.net.NetworkSpecifier;

import android.os.Parcel;
@@ -553,13 +552,6 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc 
    /** @hide */

    @Override

    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) {

            return ((WifiNetworkAgentSpecifier) other).satisfiesNetworkSpecifier(this);

        }

wifi/tests/src/android/net/wifi/WifiNetworkSpecifierTest.java

+4 −4
Original line number Diff line number Diff line
@@ -382,11 +382,11 @@ public class WifiNetworkSpecifierTest { 
    /**

     * Validate NetworkSpecifier matching.

     * 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.

     */

    @Test

    public void testWifiNetworkSpecifierSatisfiesNullAndAllMatch() {

    public void testWifiNetworkSpecifierDoesNotSatisfyNullAndAllMatch() {

        WifiConfiguration wifiConfiguration = new WifiConfiguration();

        wifiConfiguration.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);

        wifiConfiguration.preSharedKey = TEST_PRESHARED_KEY;
@@ -396,8 +396,8 @@ public class WifiNetworkSpecifierTest { 
                                MacAddress.fromString(TEST_BSSID_OUI_MASK)),

                        wifiConfiguration);



        assertTrue(specifier.canBeSatisfiedBy(null));

        assertTrue(specifier.canBeSatisfiedBy(new MatchAllNetworkSpecifier()));

        assertFalse(specifier.canBeSatisfiedBy(null));

        assertFalse(specifier.canBeSatisfiedBy(new MatchAllNetworkSpecifier()));

    }



    /**