Commit Graph

2677 Commits

Author SHA1 Message Date
Hai Shalom
efa5cc0206 Merge "[OWE] Support OWE in transition mode" into qt-dev am: 90122592ff
am: 9eac0afed6

Change-Id: Ie3fb9498d0bb124e130c5e72c28113cf43bc41b7
2019-05-14 07:26:47 -07:00
Hai Shalom
2195d1fc66 [OWE] Support OWE in transition mode
Support OWE in transition mode for devices with OWE support
and devices without OWE support. Scan results will return a
new type of network for OWE in transition networks on devices
that support OWE, and Open for devices that don't support OWE.
Handle the case where Open network is manually added to a device
that supports OWE.

Bug: 132139642
Test: Device with OWE: Connect to Open, OWE-Transition, OWE networks
Test: Device without OWE: Connect to Open, OWE-Transition
Test: Manually create Open network, connect to OWE-Transition
Change-Id: I29e69eaae2672562420ee7c6393bf2cc4d7f1b91
2019-05-13 15:37:43 -07:00
Hai Shalom
32e66072e2 Merge "[InformationElementUtil] Add FT/SAE AKM" into qt-dev am: 78f6faf13d
am: 64e52a7a9a

Change-Id: I29dbb017a80c5ca07857793301d0f3effc8a8b24
2019-05-11 23:11:08 -07:00
TreeHugger Robot
78f6faf13d Merge "[InformationElementUtil] Add FT/SAE AKM" into qt-dev 2019-05-12 05:43:32 +00:00
Hai Shalom
b6b102f014 [InformationElementUtil] Add FT/SAE AKM
Add FT/SAE AKM to InformationElementUtil class and parse it correctly so
that the phone would be able to associate with APs advertising it.
Added additional unit tests that were missing.

Bug: 132378498
Test: atest InformationElementUtilTest
Change-Id: I470e4e071de36dfe8f79475477c6077ed8bef3cb
2019-05-10 13:44:56 -07:00
Bram Bonné
51718e1db3 Merge "Documentation update for MAC access restrictions." into qt-dev am: acb1bf8387
am: 02dfff0d01

Change-Id: Iaee371289c128afcdf8401c9e9049172e3f200c0
2019-05-07 07:30:26 -07:00
Bram Bonné
5853bd038f Documentation update for MAC access restrictions.
With change ag/7340724, the device's P2P MAC adress will only be
available to callers holding the LOCAL_MAC_ADDRESS permission, and will
be anonymized otherwise. This CL updates the documentation in
WifiP2pManager to reflect that.

Bug: 132055766
Test: atest tests/src/android/net/wifi/

Change-Id: I9c2b5ce2cb2c2d2d6766fd34f3451ad4f22a5698
2019-05-07 10:16:20 +00:00
Oscar Shu
94c094ec2e Merge "Dump randomized MAC in bugreport" into qt-dev am: 0731915380
am: ee5abc6dbb

Change-Id: Ia1b4c35c18c95d4e1f52bb50962671d036f1cf07
2019-05-03 20:59:35 -07:00
Oscar Shu
0731915380 Merge "Dump randomized MAC in bugreport" into qt-dev 2019-05-03 17:00:40 +00:00
xshu
51ef178ca6 Dump randomized MAC in bugreport
Needed for debug purposes.

Bug: 131850574
Test: unit tests
Test: verified with dumpsys wifi: "mRandomizedMacAddress: 42:03:7d:d0:0e:6c"

Change-Id: Icc3eed999849c58079c298452574f68b96ba7706
2019-05-02 16:24:05 -07:00
Roshan Pius
3f35ae068f Merge "WifiSsid: Catch String out of bound exception" into qt-dev am: 4ec8b460c2
am: 0fa902cfc6

Change-Id: Ic6cab52fa6f6f55ce4ed9a46be4ea231d6a31974
2019-04-24 15:58:57 -07:00
Roshan Pius
72e1cea036 WifiSsid: Catch String out of bound exception
Bug: 130843215
Test: None
Change-Id: I6046bf0fe9e9c402e565e5fa63f0e0aec711725c
2019-04-19 09:17:59 -07:00
Hai Shalom
7bf7023ea9 Merge "[WifiEnterpriseConfig] Update javadoc for setDomainSuffixMatch" into qt-dev am: 1ead26718c
am: c20048c168

Change-Id: I5ddc42897138f79d787fdde2dfd686624429b709
2019-04-16 22:42:30 -07:00
TreeHugger Robot
1ead26718c Merge "[WifiEnterpriseConfig] Update javadoc for setDomainSuffixMatch" into qt-dev 2019-04-17 01:34:45 +00:00
Hai Shalom
ee5959b1b8 [WifiEnterpriseConfig] Update javadoc for setDomainSuffixMatch
wpa_supplicant accepts a semicolon delimited list of domain suffixes.
Update the javadoc to reflect this.

Bug: 130664269
Test: No code changes
Change-Id: I93dbabeddb8854112b413dbb27d094d9d187a73c
2019-04-16 15:04:01 -07:00
Ecco Park
ce5f7f8720 Passpoint: add NETWORK_CARRIER_PROVISIONING for removePasspointConfigurations
There is a requirement that carrier provisioning app has to add/remove
passspoint profiles whenever sim is inserted/delete.
In order to do this, the permission needs to be added for the carrier
provisioining app to remove the profile.

Bug: 130053265
Test: ./frameworks/base/wifi/tests/runtests.sh
Change-Id: I883550d92a4d716fe5a59ab9141dd70b4cc4da94
Signed-off-by: Ecco Park <eccopark@google.com>
2019-04-15 22:49:57 +00:00
Ecco Park
fedd61650e Pass the package of caller to getPasspointConfigurations into WifiService
The package information of caller is needed to check the SDK version in
WifiService layer.

Bug: 124301934
Test: ./frameworks/base/wifi/tests/runtests.sh
Change-Id: I07020da22f044bdd32d376787fc14690bf926513
Signed-off-by: Ecco Park <eccopark@google.com>
2019-04-11 17:04:23 +00:00
Etan Cohen
903c9bd539 [AWARE] Enable discovery/operation on 5G
Speed up discovery, increase robustness.

Bug: 129151127
Test: atest android.net.wifi
Test: atest atest com.android.server.wifi
Test: ACTS ThroughputTest:test_iperf_single_ndp_aware_only_ib
Change-Id: I83cf0720d07e5623b7861bf4cd73344bcff90ba5
2019-04-09 13:22:05 -07:00
Etan Cohen
6d98837eb6 Merge "[AWARE] Add unit test - fix hashing bug" into qt-dev 2019-04-08 18:21:58 +00:00
Etan Cohen
09231fb6e2 [AWARE] Add unit test - fix hashing bug
Adding unit tests to verify hashing code uncovered a bug (hashing
arrays) - fixed.

Bug: 130051430
Test: atest android.net.wifi
Test: atest com.android.server.wifi
Test: ACTS ThroughputTest:test_iperf_single_ndp_aware_only_ib
Change-Id: I4c654dd656b4bd1bce8077c73c66f458d103bc86
2019-04-06 22:28:35 -07:00
Roshan Pius
31fbd556f6 WifiManager: Restore network pin behavior on enableNetwork
This code is mostly a NO-OP for most apps & OEM's. The pinner only takes
effect if the app's target SDK < Android L. But, there might
be some OEM's who may want to enable this for all apps.

Bug: 129906426
Test: Compiles
Change-Id: Iccf67ba0d4ea8d9c5d3561a128908611636b420e
2019-04-04 14:45:21 +00:00
Andrew Solovay
ce10ef80fc docs: Javadoc cleanup
There were a number of Javadoc style problems in the
WifiNetworkSuggestion.Builder.build() docs, which caused some formatting
problems.

One specific problem worth noting: A {{ causes trouble at publish time,
because it looks like the start of a Django directive. But escaping the
{ -- e.g. &#123 -- doesn't work, because the Javadoc compiler helpfully
escapes the *ampersand*, so the HTML output is "&amp;#123", which
renders on the page as "&#123" instead of "{". So putting a space
between the two braces seems like the simplest solution.

No code changes here, just Javadoc comment fixes.

Tested by building the docs and staging to:

http://go/dac-stage/reference/android/net/wifi/WifiNetworkSuggestion.Builder#build

Screenshots (in case the stage gets overwritten):
https://screenshot.googleplex.com/o4p7efFGCbJ.png (1)
https://screenshot.googleplex.com/nkhEqU54LNb.png (2)

Bug: 128536865
Test: make ds-docs (then build & stage)
Change-Id: Ie04bc4dc517443a6899aba989beeb38b9299826e
2019-04-03 15:54:27 +00:00
TreeHugger Robot
7d90b419bf Merge "WifiManager: setWifiEnabled bypass for older apps" 2019-04-02 19:19:10 +00:00
Roshan Pius
8a277663ab WifiManager: setWifiEnabled bypass for older apps
For apps targeting older SDK (<Q), preserve the old behavior for
setWifiEnabled.

Bug: 129549163
Test: Compiles
Change-Id: I4a2e89cfa1c1ac612a679ecab6a2d526a987f7c0
2019-04-01 11:16:08 -07:00
xshu
0fa11fe4fc new WifiConfiguration @hide API to get SSID + SecurityType
Refactor for server side usage.
There is no funcational change.

Bug: 128911090
Test: unit tests
Change-Id: I84983d095ec70ba41325736f95235f09ece2c494
2019-03-29 12:39:13 -07:00
Roshan Pius
f348c9a783 Merge "WifiNetworkSuggestion: Change the polarity of priority" 2019-03-26 18:34:56 +00:00
Roshan Pius
01f9b47101 Merge "Revert "WifiConfiguration: Add a new temp blacklist reason for disconnect"" 2019-03-25 13:56:27 +00:00
Hai Shalom
f8865bd2d8 Merge "[WPA3] Initialize Suite-B ciphers correctly based on the CA cert type" 2019-03-24 16:46:58 +00:00
TreeHugger Robot
4c2ec4c89c Merge "RTT LCI API *MINOR UPDATE2* (Client Side) - removing two LCI methods Based on discussion with IEEE 802.11 WG these are not necessary for RTT." 2019-03-22 23:23:21 +00:00
Roshan Pius
33798c7793 Revert "WifiConfiguration: Add a new temp blacklist reason for disconnect"
This reverts commit 506a9b9517.

Bug: 126503889
Reason for revert: UI changes was punted to R. No rationale in making this API changing behavior now.

Change-Id: Ia8ccacc383cdb6db7520657a46d77bc1154f8569
2019-03-22 22:33:39 +00:00
Roy Want
50f6c6f36b RTT LCI API *MINOR UPDATE2* (Client Side) - removing two LCI methods
Based on discussion with IEEE 802.11 WG these are not necessary for RTT.

Bug: 111439464
Test: All unit tests pass; end-to-end tests pass.
Change-Id: I78adc0257cf65cfad9698f3d43342d5404d790e5
2019-03-22 16:40:33 +00:00
Kai Shi
555ae2e92e Wifi Usability: address comments from API review council
Rename getIsSameRegisteredCell() to isSameRegisteredCell().

Bug: 128919394
Test: wifi unit test with frameworks/base/wifi/tests/runtests.sh
Change-Id: I3549d9abbaba87971ea3c0a9edf4351289731912
2019-03-22 15:19:54 +00:00
Hai Shalom
90147e3222 [WPA3] Initialize Suite-B ciphers correctly based on the CA cert type
Initialize Suite-B ciphers correctly based on the CA cert type. Read the
cert type from key store, parse it and get the signature algorithm.
Enforce SHA384, and initialize AllowedSuiteBCiphers based on the
certificate type: RSA or ECSDA.

Bug: 128861164
Test: Verify Suite-B initialized correctly with RSA and ECDSA certs.
Test: Associate to SUITE_B_192 AP.
Test: atest WifiNetworkSuggestionTest
Change-Id: Ia9b8460caa586f695ed7aab3507ddeb4ecb8c3f3
2019-03-21 13:41:32 -07:00
Etan Cohen
d7c6a26a87 Merge "[AWARE] Update Aware NetworkSpecifier API per API council feedback" 2019-03-21 15:54:02 +00:00
Roshan Pius
fd2df95522 WifiNetworkSuggestion: Change the polarity of priority
The current ordering of priority is hard to handle inside the wifi
stack because "-1" was unassigned priority and 0 is considered the
higheest priority level.
Reverse the polarity so it's much easier to compare network
suggestions with different priorities such that
priority1 > priority2 is always true. unassigned priority will always
be lesser than any assigned priority value.

Bug: 127644378
Test: Compiles
Change-Id: I74dacdb85838250c242257a80ebbe6046cef752f
2019-03-20 11:21:10 -07:00
Etan Cohen
28b6d6a936 [AWARE] Update Aware NetworkSpecifier API per API council feedback
API council feedback:
- Move required builder methods to the constructor
- Add IntRange to port and transport protocol APIs

Bug: 128904106
Test: atest android.net.wifi.aware
Test: atest com.android.server.wifi.aware
Test: CtsVerifier Aware tests
Change-Id: I9bc978732caeada792e997bdd6263a53efdf7071
2019-03-20 07:37:32 -07:00
Kai Shi
06d82fb327 Merge "Wifi usability: add four new fields to report the latest celluar signal strength" 2019-03-19 16:39:48 +00:00
Hai Shalom
e6f3e214e3 Merge "[Wi-Fi] Do not delete certs when forgetting network" 2019-03-18 22:38:48 +00:00
Andrew Solovay
d13ac3c727 Merge "docs: Fixing {{ in code comment (which makes devsite publish choke)" 2019-03-18 21:14:49 +00:00
Mingguang Xu
e5f7947773 Merge "Wifi usability: Add expected range for Wi-Fi usability score" 2019-03-16 06:02:02 +00:00
Mingguang Xu
4fc47c2b80 Wifi usability: Add expected range for Wi-Fi usability score
In addition, fix a couple of typos in documentation.

Bug: 126391553
Bug: 126699865
Bug: 113262380
Bug: 128675382

Test: frameworks/base/wifi/tests/runtests.sh

Change-Id: I4c8d73f66f7d2d424bef3699dfc889e342621b02
Signed-off-by: Mingguang Xu <mingguangxu@google.com>
2019-03-15 15:52:08 -07:00
Andrew Solovay
68bec891b4 docs: Fixing {{ in code comment (which makes devsite publish choke)
One of the code samples in a Javadoc comment contains a {{ ;
this gets interpreted as a Django directive by our docs publish tool
(go/devsite2cmd), which results in a syntax error. We verified
(http://cl/238522152 ) that escaping one of the {s resolves the
issue.

Tested by building the docs and staging to:

http://go/mivi-stage/reference/android/net/wifi/WifiNetworkSuggestion.Builder

Bug: 128536865
Test: make ds-docs
Change-Id: I70a3e0481ad195665c878c72d0ec6b1ccbbf958f
Exempt-From-Owner-Approval: Doc-only change
2019-03-15 14:37:27 -07:00
Hai Shalom
ae8eb88f2f [Wi-Fi] Do not delete certs when forgetting network
Deleting EAP Wi-Fi configuration deletes shared credentials used by other
configs. To resolve this issue the following changes were implemented:
1. When manually adding Wi-Fi certs from storage, Wi-Fi will not attempt
to delete them when network is removed.
2. When apps use WifiEnterpriseConfig#setClientKeyEntry to add certs,
they will be deleted if the network is removed.
3. Allow the user to delete Wi-Fi certs the same way that allows the
user to add them. Make the "Remove" option available, and implement key
store removal in settings.

Bug: 30248175
Test: atest WifiEnterpriseConfigTest
Test: Load certs, remove certs from credentials menu
Test: Load cert, create 2 EAP networks that use it, forget one network
Change-Id: I5bb1a1e02437b4db4a9c0a289acc074c30a786ab
2019-03-15 13:47:02 -07:00
Roshan Pius
506a9b9517 WifiConfiguration: Add a new temp blacklist reason for disconnect
Also, added a constant to indicate the start of the permanent
blacklist reasons.

Bug: 126503889
Test: Compiles
Change-Id: I4ba1dc5377bffe34a9f236c0698c36cbf34969a9
2019-03-14 07:51:56 -07:00
Roshan Pius
35a659febd WifiManager: Fix javadocs
Bug: 128536865
Test: make docs
Change-Id: I263b66e989b2d2240e25cac31c00fc3b8a3f5a3d
2019-03-14 07:51:56 -07:00
Roshan Pius
198fa8adbf WifiNetworkSpecifier/Suggestion: Address API council comments
Modified builder methods to:
a) Add boolean input for all boolean setters.
b) Add a public value for unassigned priority and added IntRange
annotation.

Bug: 128317241
Bug: 128317186
Test: Compiles
Test: ./frameworks/base/wifi/tests/runtest.sh
Change-Id: Iaf9d26ed857fe9337d3e4006c9c894efbcfa32dd
2019-03-14 07:51:25 -07:00
Ahmed ElArabawy
8fb283da77 Wifi: Update to the WifiLock API documentation
This commit provides an update to the WifiLock types API documentation.
It adds the condition of the device to be connected to an access point
for lock to be active. This applies to both high perf and low latency
locks.

Bug: 127884567
Test: None
Change-Id: If65681939058a5d6508cf0a970517fa856cc04b3
2019-03-13 14:08:42 -07:00
TreeHugger Robot
8494e74f19 Merge "api-review: add @Nullable annotation in the argument of getMatchingOsuProviders" 2019-03-13 05:52:21 +00:00
Kai Shi
dfef383995 Wifi usability: add four new fields to report the latest celluar signal
strength

cellularDataNetworkType
cellularSignalStrengthDbm
cellularSignalStrengthDb
isSameRegisteredCell

Bug: 123095038
Test: Unit tests for Wifi: frameworks/base/wifi/tests/runtest.sh

Change-Id: I090e2ab1a327894dfc84e6ce880e887311e1df7d
2019-03-12 15:42:29 -07:00
Ecco Park
8b0c0723c5 api-review: add @Nullable annotation in the argument of getMatchingOsuProviders
Bug: 126702500
Test: UnitTest
Change-Id: I90314979ca1c9543c7646f1f6b9fcf5c65fd4577
Signed-off-by: Ecco Park <eccopark@google.com>
2019-03-12 13:53:20 -07:00