Commit Graph

2941 Commits

Author SHA1 Message Date
TreeHugger Robot
032c3aa77e Merge "[DPP R2] Update ACTION_PROCESS_WIFI_EASY_CONNECT_URI intent" 2019-12-26 19:19:54 +00:00
Hai Shalom
7cd8e71494 [DPP R2] Update ACTION_PROCESS_WIFI_EASY_CONNECT_URI intent
Update ACTION_PROCESS_WIFI_EASY_CONNECT_URI intent to include
additional information in case of a failure. The intent will
return an extra field with result code for R1 and R2 devices,
and additional details for R2 devices: SSID, channe list,
and band list.

Bug: 139381558
Test: Manual test
Change-Id: Ib25db37279289acbb3841f4b4862d8cbeb4efdd2
2019-12-26 09:18:13 -08:00
Etan Cohen
67ac97d34e Merge "[wificond] Move to wificond namespace" 2019-12-24 07:16:35 +00:00
Michael Plass
3689219477 Merge "Remove unused plumbing for connected PNO" 2019-12-23 00:27:16 +00:00
Etan Cohen
6929c91d32 [wificond] Move to wificond namespace
Move the rest of the code to the wifi.wificond namespace from the
wifi namespace. Cleanup since wificond is outside the Wi-Fi module.

Non-functional change.

Bug: 140062898
Test: atest android.net.wifi
Test: atest com.android.server.wifi
Test: ./system/connectivity/wificond/runtests.sh
Test: (CTS) atest android.net.wifi.cts
Change-Id: I64535329edbf96b1f1a0ddc0d85ebe99f9343c76
2019-12-20 18:59:46 -08:00
Michael Plass
98d8f071a4 Remove unused plumbing for connected PNO
These are not actually used.

Bug: 142081306
Test: atest FrameworksWifiWifiTests

Change-Id: I51b32b446c3df04954355784c895487f0a96ee9b
2019-12-20 15:23:20 -08:00
Hai Shalom
74e7cae65f Merge "[DPP R2] Added support for DPP R2 events" 2019-12-20 19:25:15 +00:00
Etan Cohen
195a4f72c6 Merge "[WIFICOND] Formalize the wificond AIDL interface" 2019-12-20 03:58:10 +00:00
Hai Shalom
e722cbd451 [DPP R2] Added support for DPP R2 events
Added support for DPP R2 events that provide additional
details about the onboarding process of a remote enrollee.
Specifically, DPP R2 configurator waits for response from
the enrollee, which reports back the SSID, tried channels
and band support in case it cannot find the AP. When it
reports success, then it means that it is acutally connected.

Bug: 139381558
Test: Manual tests with DPP R1 and R2 enrollees
Test: atest DppManagerTest
Test: atest WifiManagerTest
Test: atest EasyConnectStatusCallbackTest
Test: act.py -c ../WifiDppConfig.json -tc WifiDppTest
Change-Id: I55a8b1e25737e90e304f1933d09ffcd6bcae6ef9
2019-12-19 17:31:34 -08:00
Etan Cohen
18d8074536 Merge "[AWARE] Add API to expose supported cipher suites" 2019-12-20 01:07:49 +00:00
Etan Cohen
5abc6d980d [WIFICOND] Formalize the wificond AIDL interface
The wificond daemon provides an interface for the framework to interact
with the operating system when managing Wi-Fi. Since wificond is outside
the mainline module, the AIDL interface has to be formalized as an API
surface.

Bug: 140062898
Test: atest android.net.wifi
Test: atest com.android.server.wifi.aware
Test: (CTS) atest android.net.wifi.cts
Test: scan, association, SoftAP operations manually tested, kill wificond
Change-Id: Iee0fef6a454fdd84b1d0c59516d4746ddc2a4ce5
2019-12-19 11:57:04 -08:00
Jimmy Chen
813368993d Merge "Wifi: add WAPI constants and fields" 2019-12-19 09:28:52 +00:00
TreeHugger Robot
f17315d05e Merge "wifi: remove softap restore method since new API supported in R" 2019-12-19 09:02:01 +00:00
Jimmy Chen
3c21193fa1 Wifi: add WAPI constants and fields
This changes adds below WAPI codes:
* WAPI feature, proto, key management, cipher
* WAPI suite field to WifiConfiguration
* New builder method for WAPI network in WifiNetworkSuggestion.

Bug: 139257562
Test: atest FrameworksWifiApiTests
Change-Id: I5d6edec45a535f483be3319183671c90eef8539a
2019-12-19 11:43:20 +08:00
Ahmed ElArabawy
64bae6b78f Merge "Wifi: Update AP Bands to include 6GHz" 2019-12-19 02:30:14 +00:00
lesl
3db58a6149 wifi: remove softap restore method since new API supported in R
New API: retrieveSoftApBackupData/restoreSoftApBackupData

Bug: 144368124
Test: atest frameworks/base/wifi/tests/
Change-Id: I0f417f1e035ee92ee163c6f5ae86a4b1833fa6c8
2019-12-18 19:27:45 +08:00
David Su
8f24cd9db3 Expose getters for WifiP2pConfig fields
CTS cannot test @hide fields, need public getters.

Bug: 146463839
Test: atest WifiP2pConfigTest
Change-Id: Iaa6cb069fb445d65778c8c6b6a238a82160d376f
2019-12-17 22:13:41 -08:00
Ahmed ElArabawy
64c392c86f Wifi: Update AP Bands to include 6GHz
This commit updates the frequency bands to include 6GHz band.
The bands are represented as bitmask to allow combination of them.

Bug: 139354972
Test: atest com.android.wifi.server
Change-Id: Ib9c2cfa0f29489ca8e94c8e60f87a929cfea9158
2019-12-17 00:48:33 -08:00
David Su
130441b131 Create WifiAnnotations and jarjar into framework
@IntDef annotations defined in the Wifi module are
@hide and cannot be referenced from the rest of
framework. Create a separate class for Wifi
annotations that can be jarjar'ed into external
clients.

Bug: 140299412
Test: compiles
Change-Id: I5beac976b4d12fb2c01f46cb46f9c54ab54618ea
2019-12-16 17:16:07 -08:00
Etan Cohen
5b4cdd863e Merge "Wificond: transfer implementation to android.net.wifi" 2019-12-14 15:04:14 +00:00
Etan Cohen
c6c5327471 [AWARE] Add API to expose supported cipher suites
Provide a new Aware capabilities API which exposes the supported
cipher suites. These cipher suites are used to negotiate the data-
path. The framework automatially selects the strongest cipher suite
when it initiates a negotiation.

Bug: 145697276
Bug: 111446262
Test: atest com.android.server.wifi.aware
Test: (CTS) atest SingleDeviceTest
Change-Id: Ic9ec46a2aa578fa97cb174ca9745c5320ff07b52
2019-12-13 20:21:01 -08:00
Ahmed ElArabawy
abdd22ca96 Merge "Wifi: Replace dual_band with 5GHz band support" 2019-12-13 19:46:54 +00:00
Etan Cohen
73450f2004 Wificond: transfer implementation to android.net.wifi
Move implementation of wificond to frameworks/base (android.net.wifi)
in prepration for making into a public API (which will be a wrapper
around the AIDL).

Bug: 140062898
Test: atest com.android.server.wifi
Test: atest android.net.wifi
Test: associates, soft AP client information received correctly
Change-Id: I3c5ede95d0421a1e00078e0316e9a2e751156f3e
2019-12-13 11:18:54 -08:00
David Su
e8d1d0d2ca Merge "Migrate to public version of CloseGuard" 2019-12-13 17:53:01 +00:00
Ahmed ElArabawy
9f8d8061ab Wifi: Replace dual_band with 5GHz band support
As part of the support of the 6GHz band, the concept of dual-band is no
longer valid since we have more than 2 bands supported by Android and
can be checked on the device.
This commit replaces checks on dual-band support with an explicit check
on 5GHz band support.
This commit also removes the feature flags of 5GHz/6GHz support, since
these capabilities will be read from the overlay configs.

Bug: 145936758
Bug: 139354972
Test: Manual
Change-Id: I223ed2bc88c01f561d31abce4e2c91aa62da186f
Merged-In: I223ed2bc88c01f561d31abce4e2c91aa62da186f
2019-12-13 08:38:56 +00:00
David Su
b434507813 Migrate to public version of CloseGuard
Migrate to android.util.CloseGuard, which
was exposed as a public API.

Bug: 145831809
Test: atest FrameworksWifiApiTests

Change-Id: I822cc2c080adb6902f2843e29204e71573d682ab
2019-12-12 18:37:50 -08:00
lesl
5f60a7a6b9 wifi: Return SoftApConfiguration for cloud restore.
Restore process might need to notify user because
restored ap configuration requires the band conversion.

Bug: 142752869
Test: frameworks/base/wifi/tests/
Change-Id: I409a4533f8feccc888f4b605fb9466e3be0b2e89
2019-12-12 09:01:07 +00:00
TreeHugger Robot
985479534a Merge "WifiNetworAgentSpecifier - Stop importing @hide NetworkAgent" 2019-12-11 15:33:14 +00:00
TreeHugger Robot
dbafccddb5 Merge "WifiEnterpriseConfig - Stop depending on constants from android.security.Credentials" 2019-12-11 15:32:28 +00:00
David Su
1c9126d3de WifiEnterpriseConfig - Stop depending on constants from android.security.Credentials
WifiEnterpriseConfig depends on @hide constants from
android.security.Credentials. Since we can no longer
reference @hide APIs once we compile against
@SystemApi stubs, copy the constants into the Wifi
module.

Bug: 145409537
Test: compiles
Change-Id: I0b57d622f4e0788a3fd45109ab2f12976b706087
2019-12-10 22:51:32 -08:00
David Su
77f376fc0f WifiNetworAgentSpecifier - Stop importing @hide NetworkAgent
NetworkAgent is @hide, only imported for JavaDoc.
Remove import since once we build against
@SystemApi stubs this will fail.

Bug: 145409537
Test: compiles
Change-Id: I569ba8bd1784c72bb5473e8bf9bb1cf93f351b77
2019-12-10 22:41:27 -08:00
Roshan Pius
d98deeb629 statsd: Allow wifi mainline module to log its metrics (contd)
Also, stop relying on Statsd constants in WifiManager.

Bug: 145821723
Test: Compiles
Change-Id: Ie64b174863f5208ea9c23d500daf263bff6fc4bc
2019-12-10 14:46:22 -08:00
Ahmed ElArabawy
dfa678b4d1 Merge "Wifi: Add support of 6GHz band to NAN" 2019-12-10 05:45:32 +00:00
Hugo Benichi
34f8aae1c7 Merge "wifi: Remove deprecated aidl methods" 2019-12-10 04:14:09 +00:00
Hugo Benichi
f935a53508 wifi: Remove deprecated aidl methods
Bug: 122431221
Test: Compiled
Change-Id: I7f4a1036d14f1e5feed716e1ad61521a526907ae
2019-12-10 10:47:21 +09:00
David Su
e4b59bcf08 WifiManager: Remove sync version of getWifiActivityEnergyInfo
Remove synchronous version of getting the
WifiActivityEnergyInfo since the async version is the
official API.

Bug: 145244073
Test: atest FrameworksWifiApiTests
Change-Id: I71b21835746e6df111d994c77b0936f28a1e7394
2019-12-09 10:24:50 -08:00
Roshan Pius
3f9ba67fa7 Merge changes from topics "suggestion_no_uid_package", "wifi_key_value_list_parser", "wifi_power_profile", "wifi_service_manager_getService", "wifi_westworld"
* changes:
  statsd: Allow wifi mainline module to log its metrics
  wifi-services-srcs: Stop using KeyValueListParser from android.internal
  WifiNetworkSuggestion: Don't store packageName/uid
  WifiAwareManager: Add requestMacAddresses @hide API
  UserManager: Add StringDef for all restrictionKey values
  WifiActivityEnergyInfo: Use time values for energy calculation
2019-12-09 17:08:30 +00:00
David Su
cd6552f818 Merge "Copy libcore.utils.HexEncoding into Wifi module" 2019-12-07 04:13:19 +00:00
David Su
5b62f3d496 Copy libcore.utils.HexEncoding into Wifi module
@CorePlatformApi's cannot be depended on by Wifi
Mainline module. Thus create a copy and migrate
usages over.

Bug: 145409537
Test: atest FrameworksWifiApiTests
Change-Id: If4133bdd9ac9ca005538a03592462d2e1365c0d8
2019-12-07 01:10:03 +00:00
Roshan Pius
4bb69be2b0 WifiNetworkSuggestion: Don't store packageName/uid
The service will stamp the uid, package name of individual suggestions
when it creates its internal representation for each suggestion (i.e
ExtendedWifiNetworkSuggestion). This is to avoid using an @hide API
inside WifiNetworkSuggestion to stamp the uid/package name of the app
using a retrieved context.

Bug: 144102365
Test: atest android.net.wifi
Change-Id: I86651c76053b613d9eb9dc95ab51b07b11f23f16
2019-12-06 15:34:32 -08:00
Roshan Pius
d0f5475b3d WifiAwareManager: Add requestMacAddresses @hide API
Allows RttService to use WifiManager class instead of using the
AIDL object.

Bug: 145746458
Test: Compiles
Change-Id: I0949067ac7a56a6da802e8dc81eef08779a786eb
2019-12-06 15:34:32 -08:00
Ahmed ElArabawy
a027f740ee Wifi: Add support of 6GHz band to NAN
This commit adds the support of 6GHz band to NAN.

Bug: 139354972
Test: atest com.android.wifi.server
Change-Id: Ifb14b4b9d52119c782615e916b457839848f22d7
2019-12-06 08:54:06 -08:00
David Su
a69a245bb2 NetworkUtils is deprecated, migrate to Inet4AddressUtils
Migrate NetworkUtils.inetAddressToInt() to
Inet4AddressUtils.inet4AddressToIntHTL() in
preparation to jarjar Inet4AddressUtils.

Bug: 145409537
Test: compiles
Change-Id: Ia57dde498db3e9b011d0a9772717b1539348cd37
2019-12-05 14:17:40 -08:00
Ahmed ElArabawy
7596faf391 Wifi: Add minRssi and bandBonus for 6GHz band
This commit adds the minRssi and bandBonus for 6GHz band in
PNO settings.

Bug: 139354972
Test: atest com.android.server.wifi
Change-Id: I5a9920fcd6efb50e6c959617acb2f1c67db1d581
2019-12-05 17:07:16 +00:00
Roshan Pius
54e4db7b46 Merge "WifiManager: Add missing field to getConfiguredNetworks() doc" am: 846c0fe038 am: c30beb79e7
am: 4e616cf498

Change-Id: I7471e41156ccbb45783a79a25f00f5123bbec6e8
2019-12-05 00:26:05 -08:00
David Su
a0bead651f Merge changes from topics "android-os-connectivity-wifiactivityenergyinfo", "requestactivityinfo"
* changes:
  Move WifiActivityEnergyInfo to android.os.connectivity
  BatteryStats: Move WifiActivityEnergyInfo to android.os.connectivity
  Statsd: Move WifiActivityEnergyInfo to android.os.connectivity
  Formalize WifiManager#requestActivityInfo as @SystemApi
  BatteryStats: Formalize WifiManager#requestActivityInfo
  Statsd: Formalize WifiManager#requestActivityInfo
2019-12-05 01:19:27 +00:00
Ahmed ElArabawy
ea7ba96194 Merge "Wifi: Add 6GHz bands" 2019-12-04 21:45:59 +00:00
TreeHugger Robot
87fe40ced8 Merge "Remove references to @hide MacAddress.ALL_ZEROS_ADDRESS" 2019-12-04 21:43:03 +00:00
Ahmed ElArabawy
3b39715eee Wifi: Add 6GHz bands
This commit adds the 6GHz band to the list of bands available for
WifiScanner APIs

Bug: 139354972
Test: atest com.android.wifi.server
Change-Id: I7570edba0dc88f81c0b034606d55d08c39bc3782
2019-12-04 12:43:47 -08:00
David Su
4351857f97 Remove references to @hide MacAddress.ALL_ZEROS_ADDRESS
Migrate to WifiManager.ALL_ZEROS_MAC_ADDRESS.

Bug: 145409537
Test: atest FrameworksWifiApiTests
Change-Id: I6203be94847e962ba87b97d1e5b4777678b7886a
2019-12-04 11:37:23 -08:00