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

Commit d84d668d authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge changes from topic "network_request_match_callback" 

* changes:
  WifiManager: Network request match callback registration
  wifi(API): NetworkSpecifier for Wifi NetworkAgent
  wifi(API): Mark old API's deprecated
  wifi(API): New API surface for network suggestion
  wifi(API): New API surface for connection via NetworkRequest
parents 1cc9e5a9 3c38ee43

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -595,6 +595,8 @@ java_defaults { 
        "telephony/java/com/android/internal/telephony/euicc/ISetDefaultSmdpAddressCallback.aidl",

        "telephony/java/com/android/internal/telephony/euicc/ISetNicknameCallback.aidl",

        "telephony/java/com/android/internal/telephony/euicc/ISwitchToProfileCallback.aidl",

        "wifi/java/android/net/wifi/INetworkRequestMatchCallback.aidl",

        "wifi/java/android/net/wifi/INetworkRequestUserSelectionCallback.aidl",

        "wifi/java/android/net/wifi/ISoftApCallback.aidl",

        "wifi/java/android/net/wifi/ITrafficStateCallback.aidl",

        "wifi/java/android/net/wifi/IWifiManager.aidl",

api/current.txt

+36 −11
Original line number Diff line number Diff line
@@ -28690,7 +28690,7 @@ package android.net.wifi { 
    enum_constant public static final android.net.wifi.SupplicantState UNINITIALIZED;

  }













  public class WifiConfiguration implements android.os.Parcelable {













  public deprecated class WifiConfiguration implements android.os.Parcelable {















    ctor public WifiConfiguration();















    method public int describeContents();















    method public android.net.ProxyInfo getHttpProxy();










@@ -28844,7 +28844,8 @@ package android.net.wifi {













  }





























  public class WifiManager {













    method public int addNetwork(android.net.wifi.WifiConfiguration);













    method public deprecated int addNetwork(android.net.wifi.WifiConfiguration);













    method public boolean addNetworkSuggestions(java.util.List<android.net.wifi.WifiNetworkSuggestion>, android.app.PendingIntent);















    method public void addOrUpdatePasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration);















    method public static int calculateSignalLevel(int, int);















    method public deprecated void cancelWps(android.net.wifi.WifiManager.WpsCallback);









@@ -28852,10 +28853,10 @@ package android.net.wifi {













    method public android.net.wifi.WifiManager.MulticastLock createMulticastLock(java.lang.String);















    method public android.net.wifi.WifiManager.WifiLock createWifiLock(int, java.lang.String);















    method public android.net.wifi.WifiManager.WifiLock createWifiLock(java.lang.String);













    method public boolean disableNetwork(int);













    method public boolean disconnect();













    method public boolean enableNetwork(int, boolean);













    method public java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks();













    method public deprecated boolean disableNetwork(int);













    method public deprecated boolean disconnect();













    method public deprecated boolean enableNetwork(int, boolean);













    method public deprecated java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks();















    method public android.net.wifi.WifiInfo getConnectionInfo();















    method public android.net.DhcpInfo getDhcpInfo();















    method public java.util.List<android.net.wifi.hotspot2.PasspointConfiguration> getPasspointConfigurations();









@@ -28870,18 +28871,19 @@ package android.net.wifi {













    method public boolean isTdlsSupported();















    method public boolean isWifiEnabled();















    method public deprecated boolean pingSupplicant();













    method public boolean reassociate();













    method public boolean reconnect();













    method public boolean removeNetwork(int);













    method public deprecated boolean reassociate();













    method public deprecated boolean reconnect();













    method public deprecated boolean removeNetwork(int);













    method public boolean removeNetworkSuggestions(java.util.List<android.net.wifi.WifiNetworkSuggestion>);















    method public void removePasspointConfiguration(java.lang.String);















    method public deprecated boolean saveConfiguration();















    method public void setTdlsEnabled(java.net.InetAddress, boolean);















    method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean);













    method public boolean setWifiEnabled(boolean);













    method public deprecated boolean setWifiEnabled(boolean);















    method public void startLocalOnlyHotspot(android.net.wifi.WifiManager.LocalOnlyHotspotCallback, android.os.Handler);















    method public deprecated boolean startScan();















    method public deprecated void startWps(android.net.wifi.WpsInfo, android.net.wifi.WifiManager.WpsCallback);













    method public int updateNetwork(android.net.wifi.WifiConfiguration);













    method public deprecated int updateNetwork(android.net.wifi.WifiConfiguration);















    field public static final java.lang.String ACTION_PICK_WIFI_NETWORK = "android.net.wifi.PICK_WIFI_NETWORK";















    field public static final java.lang.String ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE = "android.net.wifi.action.REQUEST_SCAN_ALWAYS_AVAILABLE";















    field public static final deprecated int ERROR_AUTHENTICATING = 1; // 0x1










@@ -28955,6 +28957,29 @@ package android.net.wifi {













    method public abstract deprecated void onSucceeded();















  }



























  public class WifiNetworkConfigBuilder {













    ctor public WifiNetworkConfigBuilder();













    method public android.net.NetworkSpecifier buildNetworkSpecifier();













    method public android.net.wifi.WifiNetworkSuggestion buildNetworkSuggestion();













    method public android.net.wifi.WifiNetworkConfigBuilder setBssid(android.net.MacAddress);













    method public android.net.wifi.WifiNetworkConfigBuilder setBssidPattern(android.net.MacAddress, android.net.MacAddress);













    method public android.net.wifi.WifiNetworkConfigBuilder setEnterpriseConfig(android.net.wifi.WifiEnterpriseConfig);













    method public android.net.wifi.WifiNetworkConfigBuilder setIsAppInteractionRequired();













    method public android.net.wifi.WifiNetworkConfigBuilder setIsHiddenSsid();













    method public android.net.wifi.WifiNetworkConfigBuilder setIsMetered();













    method public android.net.wifi.WifiNetworkConfigBuilder setIsUserInteractionRequired();













    method public android.net.wifi.WifiNetworkConfigBuilder setPriority(int);













    method public android.net.wifi.WifiNetworkConfigBuilder setPskPassphrase(java.lang.String);













    method public android.net.wifi.WifiNetworkConfigBuilder setSsid(java.lang.String);













    method public android.net.wifi.WifiNetworkConfigBuilder setSsidPattern(android.os.PatternMatcher);













  }

























  public final class WifiNetworkSuggestion implements android.os.Parcelable {













    method public int describeContents();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.net.wifi.WifiNetworkSuggestion> CREATOR;













  }



























  public deprecated class WpsInfo implements android.os.Parcelable {















    ctor public deprecated WpsInfo();















    ctor public deprecated WpsInfo(android.net.wifi.WpsInfo);

























api/system-current.txt



+15
−1




























Original line number
Diff line number
Diff line








@@ -3615,7 +3615,7 @@ package android.net.wifi {













    field public byte id;















  }





























  public class WifiConfiguration implements android.os.Parcelable {













  public deprecated class WifiConfiguration implements android.os.Parcelable {















    method public boolean hasNoInternetAccess();















    method public boolean isEphemeral();















    method public boolean isNoInternetAccessExpected();










@@ -3644,8 +3644,10 @@ package android.net.wifi {













    method public boolean isPortableHotspotSupported();















    method public boolean isWifiApEnabled();















    method public boolean isWifiScannerSupported();













    method public void registerNetworkRequestMatchCallback(android.net.wifi.WifiManager.NetworkRequestMatchCallback, android.os.Handler);















    method public boolean setWifiApConfiguration(android.net.wifi.WifiConfiguration);















    method public boolean startScan(android.os.WorkSource);













    method public void unregisterNetworkRequestMatchCallback(android.net.wifi.WifiManager.NetworkRequestMatchCallback);















    field public static final int CHANGE_REASON_ADDED = 0; // 0x0















    field public static final int CHANGE_REASON_CONFIG_CHANGE = 2; // 0x2















    field public static final int CHANGE_REASON_REMOVED = 1; // 0x1










@@ -3673,6 +3675,18 @@ package android.net.wifi {













    method public abstract void onSuccess();















  }





























  public static abstract interface WifiManager.NetworkRequestMatchCallback {













    method public abstract void onMatch(java.util.List<android.net.wifi.WifiConfiguration>);













    method public abstract void onUserSelectionCallbackRegistration(android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback);













    method public abstract void onUserSelectionConnectFailure(android.net.wifi.WifiConfiguration);













    method public abstract void onUserSelectionConnectSuccess(android.net.wifi.WifiConfiguration);













  }



























  public static abstract interface WifiManager.NetworkRequestUserSelectionCallback {













    method public abstract void reject();













    method public abstract void select(android.net.wifi.WifiConfiguration);













  }





























  public class WifiNetworkConnectionStatistics implements android.os.Parcelable {















    ctor public WifiNetworkConnectionStatistics(int, int);















    ctor public WifiNetworkConnectionStatistics();

































core/java/android/net/MacAddress.java



+15
−0




























Original line number
Diff line number
Diff line








@@ -393,4 +393,19 @@ public final class MacAddress implements Parcelable {













        }















        return out;















    }



























    /**













     * Checks if this MAC Address matches the provided range.













     *













     * @param baseAddress MacAddress representing the base address to compare with.













     * @param mask MacAddress representing the mask to use during comparison.













     * @return true if this MAC Address matches the given range.













     *













     * @hide













     */













    public boolean matches(@NonNull MacAddress baseAddress, @NonNull MacAddress mask) {













        Preconditions.checkNotNull(baseAddress);













        Preconditions.checkNotNull(mask);













        return (mAddr & mask.mAddr) == (baseAddress.mAddr & mask.mAddr);













    }















}
























tests/net/java/android/net/MacAddressTest.java



+34
−1




























Original line number
Diff line number
Diff line








@@ -17,8 +17,8 @@













package android.net;































import static org.junit.Assert.assertEquals;













import static org.junit.Assert.assertTrue;















import static org.junit.Assert.assertFalse;













import static org.junit.Assert.assertTrue;















import static org.junit.Assert.fail;































import android.support.test.filters.SmallTest;










@@ -252,6 +252,39 @@ public class MacAddressTest {













        }















    }





























    @Test













    public void testMatches() {













        // match 4 bytes prefix













        assertTrue(MacAddress.fromString("aa:bb:cc:dd:ee:11").matches(













                MacAddress.fromString("aa:bb:cc:dd:00:00"),













                MacAddress.fromString("ff:ff:ff:ff:00:00")));



























        // match bytes 0,1,2 and 5













        assertTrue(MacAddress.fromString("aa:bb:cc:dd:ee:11").matches(













                MacAddress.fromString("aa:bb:cc:00:00:11"),













                MacAddress.fromString("ff:ff:ff:00:00:ff")));



























        // match 34 bit prefix













        assertTrue(MacAddress.fromString("aa:bb:cc:dd:ee:11").matches(













                MacAddress.fromString("aa:bb:cc:dd:c0:00"),













                MacAddress.fromString("ff:ff:ff:ff:c0:00")));



























        // fail to match 36 bit prefix













        assertFalse(MacAddress.fromString("aa:bb:cc:dd:ee:11").matches(













                MacAddress.fromString("aa:bb:cc:dd:40:00"),













                MacAddress.fromString("ff:ff:ff:ff:f0:00")));



























        // match all 6 bytes













        assertTrue(MacAddress.fromString("aa:bb:cc:dd:ee:11").matches(













                MacAddress.fromString("aa:bb:cc:dd:ee:11"),













                MacAddress.fromString("ff:ff:ff:ff:ff:ff")));



























        // match none of 6 bytes













        assertTrue(MacAddress.fromString("aa:bb:cc:dd:ee:11").matches(













                MacAddress.fromString("00:00:00:00:00:00"),













                MacAddress.fromString("00:00:00:00:00:00")));













    }





























    static byte[] toByteArray(int... in) {















        byte[] out = new byte[in.length];















        for (int i = 0; i < in.length; i++) {