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

Commit b2ca3c24 authored Sep 10, 2020 by Jimmy Chen Committed by Android (Google) Code Review Sep 10, 2020

Merge changes from topics "60ghz-7-60ghz-definition-3", "60ghz-7-60ghz-definition-4"

* changes:
  wifi: Add WifiMananger API is60GHzBandSupported
  wifi: add DMG BSS capability definition
  wifi: add support for GCMP_128

parents 2bacda92 25d969e2

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -31303,6 +31303,7 @@ package android.net.wifi {

		@Deprecated public static class WifiConfiguration.GroupCipher {
		field @Deprecated public static final int CCMP = 3; // 0x3
		field @Deprecated public static final int GCMP_128 = 7; // 0x7
		field @Deprecated public static final int GCMP_256 = 5; // 0x5
		field @Deprecated public static final int SMS4 = 6; // 0x6
		field @Deprecated public static final int TKIP = 2; // 0x2
		@@ -31332,6 +31333,7 @@ package android.net.wifi {

		@Deprecated public static class WifiConfiguration.PairwiseCipher {
		field @Deprecated public static final int CCMP = 2; // 0x2
		field @Deprecated public static final int GCMP_128 = 5; // 0x5
		field @Deprecated public static final int GCMP_256 = 3; // 0x3
		field @Deprecated public static final int NONE = 0; // 0x0
		field @Deprecated public static final int SMS4 = 4; // 0x4

api/system-current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -7344,6 +7344,7 @@ package android.net.wifi {
		method @Deprecated @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public android.net.wifi.WifiConfiguration getWifiApConfiguration();
		method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public int getWifiApState();
		method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.net.wifi.WifiConfiguration> getWifiConfigForMatchedNetworkSuggestionsSharedWithUser(@NonNull java.util.List<android.net.wifi.ScanResult>);
		method public boolean is60GHzBandSupported();
		method public boolean isApMacRandomizationSupported();
		method public boolean isConnectedMacRandomizationSupported();
		method @Deprecated public boolean isDeviceToDeviceRttSupported();
		@@ -7823,6 +7824,8 @@ package android.net.wifi.nl80211 {
		field public static final int BSS_CAPABILITY_CF_POLL_REQUEST = 8; // 0x8
		field public static final int BSS_CAPABILITY_CHANNEL_AGILITY = 128; // 0x80
		field public static final int BSS_CAPABILITY_DELAYED_BLOCK_ACK = 16384; // 0x4000
		field public static final int BSS_CAPABILITY_DMG_ESS = 3; // 0x3
		field public static final int BSS_CAPABILITY_DMG_IBSS = 1; // 0x1
		field public static final int BSS_CAPABILITY_DSSS_OFDM = 8192; // 0x2000
		field public static final int BSS_CAPABILITY_ESS = 1; // 0x1
		field public static final int BSS_CAPABILITY_IBSS = 2; // 0x2

non-updatable-api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -6813,6 +6813,8 @@ package android.net.wifi.nl80211 {
		field public static final int BSS_CAPABILITY_CF_POLL_REQUEST = 8; // 0x8
		field public static final int BSS_CAPABILITY_CHANNEL_AGILITY = 128; // 0x80
		field public static final int BSS_CAPABILITY_DELAYED_BLOCK_ACK = 16384; // 0x4000
		field public static final int BSS_CAPABILITY_DMG_ESS = 3; // 0x3
		field public static final int BSS_CAPABILITY_DMG_IBSS = 1; // 0x1
		field public static final int BSS_CAPABILITY_DSSS_OFDM = 8192; // 0x2000
		field public static final int BSS_CAPABILITY_ESS = 1; // 0x1
		field public static final int BSS_CAPABILITY_IBSS = 2; // 0x2

wifi/api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -144,6 +144,7 @@ package android.net.wifi {

		@Deprecated public static class WifiConfiguration.GroupCipher {
		field @Deprecated public static final int CCMP = 3; // 0x3
		field @Deprecated public static final int GCMP_128 = 7; // 0x7
		field @Deprecated public static final int GCMP_256 = 5; // 0x5
		field @Deprecated public static final int SMS4 = 6; // 0x6
		field @Deprecated public static final int TKIP = 2; // 0x2
		@@ -173,6 +174,7 @@ package android.net.wifi {

		@Deprecated public static class WifiConfiguration.PairwiseCipher {
		field @Deprecated public static final int CCMP = 2; // 0x2
		field @Deprecated public static final int GCMP_128 = 5; // 0x5
		field @Deprecated public static final int GCMP_256 = 3; // 0x3
		field @Deprecated public static final int NONE = 0; // 0x0
		field @Deprecated public static final int SMS4 = 4; // 0x4

wifi/api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -449,6 +449,7 @@ package android.net.wifi {
		method @Deprecated @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public android.net.wifi.WifiConfiguration getWifiApConfiguration();
		method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public int getWifiApState();
		method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.net.wifi.WifiConfiguration> getWifiConfigForMatchedNetworkSuggestionsSharedWithUser(@NonNull java.util.List<android.net.wifi.ScanResult>);
		method public boolean is60GHzBandSupported();
		method public boolean isApMacRandomizationSupported();
		method public boolean isConnectedMacRandomizationSupported();
		method @Deprecated public boolean isDeviceToDeviceRttSupported();