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

Commit 025eab03 authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

Merge changes from topics "frameworkswifiapitests-jacoco",... 

Merge changes from topics "frameworkswifiapitests-jacoco", "settingsunittests-wifi-systemapi", "sl4a-access-wifi-hidden-apis"

* changes:
  Remove FrameworksWifiApiTests jacoco exclude_filter
  FrameworksWifiApiTests: build against framework-wifi (Attempt 2)
  Convert FrameworksWifiApiTests mk to bp (Attempt 2)
  Give SL4A access to @hide Wifi APIs
  Expose WifiInfo & NetworkSelectionStatus Builders for SettingsUnitTests
  Expose WifiEnterpriseConfig.getClientPrivateKey() for WifiConfigurationProviderTest
  Expose ScanResult constructor for SettingsLibRoboTests
  SettingsLibTests: grant access to Wifi @hide APIs
  TetheringTests: Stop using @hide Wifi P2P APIs
parents fd7286ae 3dde0c62

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -30507,6 +30507,7 @@ package android.net.wifi { 
    method @Nullable public java.security.cert.X509Certificate[] getCaCertificates();

    method @Nullable public java.security.cert.X509Certificate[] getCaCertificates();

    method public java.security.cert.X509Certificate getClientCertificate();

    method public java.security.cert.X509Certificate getClientCertificate();

    method @Nullable public java.security.cert.X509Certificate[] getClientCertificateChain();

    method @Nullable public java.security.cert.X509Certificate[] getClientCertificateChain();

    method @Nullable public java.security.PrivateKey getClientPrivateKey();

    method public String getDomainSuffixMatch();

    method public String getDomainSuffixMatch();

    method public int getEapMethod();

    method public int getEapMethod();

    method public String getIdentity();

    method public String getIdentity();

api/system-current.txt

+22 −0
Original line number Original line Diff line number Diff line
@@ -5918,6 +5918,7 @@ package android.net.wifi { 
  }

  }

















  public class ScanResult implements android.os.Parcelable {







  public class ScanResult implements android.os.Parcelable {














    ctor public ScanResult();











    field public static final int CIPHER_CCMP = 3; // 0x3







    field public static final int CIPHER_CCMP = 3; // 0x3











    field public static final int CIPHER_GCMP_256 = 4; // 0x4







    field public static final int CIPHER_GCMP_256 = 4; // 0x4











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







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










@@ -6034,6 +6035,7 @@ package android.net.wifi {









    method @Deprecated public static boolean isMetered(@Nullable android.net.wifi.WifiConfiguration, @Nullable android.net.wifi.WifiInfo);







    method @Deprecated public static boolean isMetered(@Nullable android.net.wifi.WifiConfiguration, @Nullable android.net.wifi.WifiInfo);











    method @Deprecated public boolean isNoInternetAccessExpected();







    method @Deprecated public boolean isNoInternetAccessExpected();











    method @Deprecated public void setIpConfiguration(@Nullable android.net.IpConfiguration);







    method @Deprecated public void setIpConfiguration(@Nullable android.net.IpConfiguration);














    method @Deprecated public void setNetworkSelectionStatus(@NonNull android.net.wifi.WifiConfiguration.NetworkSelectionStatus);











    method @Deprecated public void setProxy(@NonNull android.net.IpConfiguration.ProxySettings, @NonNull android.net.ProxyInfo);







    method @Deprecated public void setProxy(@NonNull android.net.IpConfiguration.ProxySettings, @NonNull android.net.ProxyInfo);











    field @Deprecated public static final int AP_BAND_2GHZ = 0; // 0x0







    field @Deprecated public static final int AP_BAND_2GHZ = 0; // 0x0











    field @Deprecated public static final int AP_BAND_5GHZ = 1; // 0x1







    field @Deprecated public static final int AP_BAND_5GHZ = 1; // 0x1










@@ -6078,6 +6080,7 @@ package android.net.wifi {









    method @Deprecated public boolean getHasEverConnected();







    method @Deprecated public boolean getHasEverConnected();











    method @Deprecated @Nullable public static String getNetworkDisableReasonString(int);







    method @Deprecated @Nullable public static String getNetworkDisableReasonString(int);











    method @Deprecated public int getNetworkSelectionDisableReason();







    method @Deprecated public int getNetworkSelectionDisableReason();














    method @Deprecated public int getNetworkSelectionStatus();











    method @Deprecated @NonNull public String getNetworkStatusString();







    method @Deprecated @NonNull public String getNetworkStatusString();











    method @Deprecated public boolean isNetworkEnabled();







    method @Deprecated public boolean isNetworkEnabled();











    method @Deprecated public boolean isNetworkPermanentlyDisabled();







    method @Deprecated public boolean isNetworkPermanentlyDisabled();









@@ -6092,6 +6095,16 @@ package android.net.wifi {









    field @Deprecated public static final int DISABLED_NO_INTERNET_TEMPORARY = 4; // 0x4







    field @Deprecated public static final int DISABLED_NO_INTERNET_TEMPORARY = 4; // 0x4











    field @Deprecated public static final int NETWORK_SELECTION_DISABLED_MAX = 10; // 0xa







    field @Deprecated public static final int NETWORK_SELECTION_DISABLED_MAX = 10; // 0xa











    field @Deprecated public static final int NETWORK_SELECTION_ENABLE = 0; // 0x0







    field @Deprecated public static final int NETWORK_SELECTION_ENABLE = 0; // 0x0














    field @Deprecated public static final int NETWORK_SELECTION_ENABLED = 0; // 0x0














    field @Deprecated public static final int NETWORK_SELECTION_PERMANENTLY_DISABLED = 2; // 0x2














    field @Deprecated public static final int NETWORK_SELECTION_TEMPORARY_DISABLED = 1; // 0x1














  }



























  @Deprecated public static final class WifiConfiguration.NetworkSelectionStatus.Builder {














    ctor @Deprecated public WifiConfiguration.NetworkSelectionStatus.Builder();














    method @Deprecated @NonNull public android.net.wifi.WifiConfiguration.NetworkSelectionStatus build();














    method @Deprecated @NonNull public android.net.wifi.WifiConfiguration.NetworkSelectionStatus.Builder setNetworkSelectionDisableReason(int);














    method @Deprecated @NonNull public android.net.wifi.WifiConfiguration.NetworkSelectionStatus.Builder setNetworkSelectionStatus(int);











  }







  }



























  @Deprecated public static class WifiConfiguration.RecentFailure {







  @Deprecated public static class WifiConfiguration.RecentFailure {










@@ -6136,6 +6149,15 @@ package android.net.wifi {









    field public static final int INVALID_RSSI = -127; // 0xffffff81







    field public static final int INVALID_RSSI = -127; // 0xffffff81











  }







  }






























  public static final class WifiInfo.Builder {














    ctor public WifiInfo.Builder();














    method @NonNull public android.net.wifi.WifiInfo build();














    method @NonNull public android.net.wifi.WifiInfo.Builder setBssid(@NonNull String);














    method @NonNull public android.net.wifi.WifiInfo.Builder setNetworkId(int);














    method @NonNull public android.net.wifi.WifiInfo.Builder setRssi(int);














    method @NonNull public android.net.wifi.WifiInfo.Builder setSsid(@NonNull byte[]);














  }
























  public class WifiManager {







  public class WifiManager {











    method @RequiresPermission(android.Manifest.permission.WIFI_UPDATE_USABILITY_STATS_SCORE) public void addOnWifiUsabilityStatsListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.OnWifiUsabilityStatsListener);







    method @RequiresPermission(android.Manifest.permission.WIFI_UPDATE_USABILITY_STATS_SCORE) public void addOnWifiUsabilityStatsListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.OnWifiUsabilityStatsListener);











    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void allowAutojoin(int, boolean);







    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void allowAutojoin(int, boolean);

































packages/SettingsLib/tests/integ/Android.bp



+4
−1




























Original line number
Original line
Diff line number
Diff line








@@ -14,7 +14,10 @@





























android_test {







android_test {











    name: "SettingsLibTests",







    name: "SettingsLibTests",











    defaults: ["SettingsLibDefaults"],







    defaults: [














        "SettingsLibDefaults",














        "framework-wifi-test-defaults"














    ],































    certificate: "platform",







    certificate: "platform",





















































packages/Tethering/tests/unit/src/com/android/server/connectivity/tethering/TetheringTest.java



+8
−6




























Original line number
Original line
Diff line number
Diff line








@@ -501,13 +501,15 @@ public class TetheringTest {









        p2pInfo.groupFormed = isGroupFormed;







        p2pInfo.groupFormed = isGroupFormed;











        p2pInfo.isGroupOwner = isGroupOwner;







        p2pInfo.isGroupOwner = isGroupOwner;































        WifiP2pGroup group = new WifiP2pGroup();







        WifiP2pGroup group = mock(WifiP2pGroup.class);











        group.setIsGroupOwner(isGroupOwner);







        when(group.isGroupOwner()).thenReturn(isGroupOwner);











        group.setInterface(ifname);







        when(group.getInterface()).thenReturn(ifname);





























        final Intent intent = mock(Intent.class);














        when(intent.getAction()).thenReturn(WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION);














        when(intent.getParcelableExtra(WifiP2pManager.EXTRA_WIFI_P2P_INFO)).thenReturn(p2pInfo);














        when(intent.getParcelableExtra(WifiP2pManager.EXTRA_WIFI_P2P_GROUP)).thenReturn(group);































        final Intent intent = new Intent(WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION);














        intent.putExtra(WifiP2pManager.EXTRA_WIFI_P2P_INFO, p2pInfo);














        intent.putExtra(WifiP2pManager.EXTRA_WIFI_P2P_GROUP, group);














        mServiceContext.sendBroadcastAsUserMultiplePermissions(intent, UserHandle.ALL,







        mServiceContext.sendBroadcastAsUserMultiplePermissions(intent, UserHandle.ALL,











                P2P_RECEIVER_PERMISSIONS_FOR_BROADCAST);







                P2P_RECEIVER_PERMISSIONS_FOR_BROADCAST);











    }







    }

































wifi/Android.bp



+2
−0




























Original line number
Original line
Diff line number
Diff line








@@ -50,6 +50,8 @@ test_access_hidden_api_whitelist = [





























    "//frameworks/opt/net/wifi/libs/WifiTrackerLib/tests",







    "//frameworks/opt/net/wifi/libs/WifiTrackerLib/tests",











    "//external/robolectric-shadows:__subpackages__",







    "//external/robolectric-shadows:__subpackages__",














    "//frameworks/base/packages/SettingsLib/tests/integ",














    "//external/sl4a:__subpackages__",











]







]































// wifi-service needs pre-jarjared version of framework-wifi so it can reference copied utility







// wifi-service needs pre-jarjared version of framework-wifi so it can reference copied utility