1618 Commits

Author SHA1 Message Date
Treehugger Robot
a908e65b66 Merge "wifi: add constant definition for EAP types" 2016-11-17 02:10:23 +00:00
Ningyuan Wang
6e67bb87cf Merge "Add security capabilities enums to ScanResult"
am: a3c0324824

Change-Id: Iad2aba87155d52343b372b2d7af3e037842c1ca4
2016-11-16 23:54:24 +00:00
Peter Qiu
a32e50986e wifi: hotspot2: add copy constructor for PasspointConfiguration
Bug: 32714562
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Ida7e4da3d6a9679743397643e0250434dbdb43af
2016-11-16 15:35:48 -08:00
Peter Qiu
a25d717de8 wifi: hotspot2: add support for validating passpoint configuration
Bug: 32572199
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I8e649430af54d863dfa5492abc3dfd79c772c765
2016-11-16 15:08:03 -08:00
Peter Qiu
4a79ac2c82 wifi: add constant definition for EAP types
Bug: 32810711
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Ia62f2674e8cdf975d1380f733a8687bdb15ed197
2016-11-16 13:49:22 -08:00
Ningyuan Wang
d150b2b001 Add security capabilities enums to ScanResult
This adds enums of security parameters, including
protocol, key management, and cipher suites.

Bug: 32512793
Test: compile

Change-Id: Ibf784d79695ca5e261c6bfe623406bc693c5ac17
2016-11-16 11:13:42 -08:00
Peter Qiu
1b39c61ce7 wifi: remove unused hidden Hotspot 2.0 Release 1 API
am: 1c3054ea87

Change-Id: I5a13979aedb39ad347099fd25e7515b099b9ac19
2016-11-16 00:00:06 +00:00
Peter Qiu
a9a9a9bb8d wifi: remove hidden unused Hotspot 2.0 Release 2 APIs
am: a38558b539

Change-Id: I48766f0c259693496dc9b63ad0dd287b93185787
2016-11-15 23:59:20 +00:00
Svetoslav Ganov
6c3032f16b Add WiFi toggle prompts - framework
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749

Original-Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
Change-Id: I3fdc2b02abecaf3166614b0cb9fac3553cb7ab88
(cherry picked from commit d3663c04a721e0848dd3e9179c84ba585d91839d)
2016-11-14 18:34:40 -08:00
Peter Qiu
1c3054ea87 wifi: remove unused hidden Hotspot 2.0 Release 1 API
WifiManager#buildWifiConfig was used by the Hotspot 2.0 Release 1
app (WifiInstaller) for parsing Release 1 installation data into
a WifiConfiguration object.  WifiInstaller will be updated to use
the new framework API (android.net.wifi.hotspot2.ConfigBuilder)
instead. So this API is no longer needed.

Bug: 32509661
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Iacee739a9ed12ea00b1b7457e22e790ef4a177da
2016-11-14 13:23:01 -08:00
Peter Qiu
a38558b539 wifi: remove hidden unused Hotspot 2.0 Release 2 APIs
These APIs are used for installing/modifying the PerProviderSubscription
Management Object tree in XML string representation and are used only by
the unreleased Hotspot 2.0 Release 2 app (OSU app).  The OSU app will be
updated to use the new APIs which uses Parcelable objects to represent
provider configuration.

Bug: 32509661
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Iff6b6e4b95b76d48201eeeb47f441b7c94f359bb
2016-11-14 13:23:01 -08:00
Sohani Rao
584b5cee49 Merge "Add WiFi toggle prompts - framework" 2016-11-14 20:59:36 +00:00
Sohani Rao
7342bb84cd Merge "Permissions check for Wifi Display configuration"
am: f5c32a411c

Change-Id: I7a1c2d0f48728cd5e056076a2cf1499a7abb2438
2016-11-14 19:33:31 +00:00
Svetoslav Ganov
0efa843e72 Add WiFi toggle prompts - framework
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

Bug: 28715749
Test: Unit Tests

Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
Merged-In: I020601e208c0736005bcabc7b7b77b96eee45b03
2016-11-14 10:26:52 -08:00
Sohani Rao
ef401300e8 Permissions check for Wifi Display configuration
Wifi Display is configured using the AIDL call setMiracastMode()
and using a message over the async channel SET_WFD_INFO.
Enforce permissions on the calling uid before updating the config

Bug: 18668877
Test: Unit tests
Change-Id: I0be2d2af49070aad759f24bd31331f7df39a0422
Merged-In: I0be2d2af49070aad759f24bd31331f7df39a0422
2016-11-14 10:21:31 -08:00
Peter Qiu
5451f8279e Merge "wifi: hotspot2: add Passpoint APIs to WifiManager"
am: 0295d7bd38

Change-Id: I79279f22bfc9642ed7905d099dd43555714ea815
2016-11-10 22:07:11 +00:00
Treehugger Robot
0295d7bd38 Merge "wifi: hotspot2: add Passpoint APIs to WifiManager" 2016-11-10 21:56:56 +00:00
Peter Qiu
861e99e815 Merge "wifi: hotspot2: add support for parsing Release 1 installation file"
am: 44e817fdcf

Change-Id: If165cadffd0ae93fb94d1883f41851f1d92d50f6
2016-11-10 20:19:51 +00:00
Treehugger Robot
44e817fdcf Merge "wifi: hotspot2: add support for parsing Release 1 installation file" 2016-11-10 20:06:07 +00:00
Peter Qiu
01894d8f6b wifi: hotspot2: add Passpoint APIs to WifiManager
Add dedicated APIs for managing Passpoint configurations, since
Passpoint configurations are different from WiFi network
configurations.  A Passpoint configuration provides a credential for
authenticating to one or more WiFi networks that are operated
by the "same" service provider.

Bug: 32282711
Test: make -j32

Change-Id: I52822ab3074e2f2a3d986e3c0a24d024f2c06dca
2016-11-10 10:35:19 -08:00
Peter Qiu
057714d1b9 wifi: hotspot2: add support for parsing Release 1 installation file
Bug: 32277793
Test: frameworks/base/wifi/tests/runtests.sh

Change-Id: I526c5e88e504c9c843d517a1a8208bc35d8655e9
2016-11-10 10:35:13 -08:00
Randy Pan
33600a3d38 Merge "Wifi Tx/Rx rate computation"
am: bccf93311c

Change-Id: I8b564af08155dcb49cf5f71d283b21091b80d3e0
2016-11-10 16:15:52 +00:00
Randy Pan
bccf93311c Merge "Wifi Tx/Rx rate computation" 2016-11-10 16:02:58 +00:00
Sohani Rao
e8431a09ca Merge "Update REQUEST_PEERS message with calling package"
am: 836e74052e

Change-Id: Ib22ae41f991ce68d47e2f7437984c7fa248dd235
2016-11-09 19:26:51 +00:00
Randy Pan
7872f39869 Wifi Tx/Rx rate computation
Factor in the timestamp when computing the Tx/Rx rates. The
reported rate is a combination of current and previous rates
with a heavier weight from the current rate.

Bug: 30982272
Test: Ran the new image and compared the results against the
      old algorithm.

Change-Id: I485b7002416f382993353d9f6240ea63cb08ddae
2016-11-09 00:39:39 +00:00
Sohani Rao
72d6dca09e Update REQUEST_PEERS message with calling package
The service enforces location permissions on the caller,
verifies the calling package is registered with the uid.

BUG: 30760540
Test: Unit tests, P2p scan to get peer list and
       establishing a Wifi Direct connection
Change-Id: Ia0eb466a370a00c0264944871ce348841a17abc3
Merged-In: Ia0eb466a370a00c0264944871ce348841a17abc3
2016-11-08 11:02:52 -08:00
Etan Cohen
60e6734100 Merge "[AWARE] Fix visibility of Aware Characteristics API"
am: 13c76b77dc

Change-Id: Ie12c01e0d8e29e13e2ebcf1f49c56a1a8f705637
2016-11-07 23:35:37 +00:00
Etan Cohen
29b3e79ae2 [AWARE] Fix visibility of Aware Characteristics API
Hide the get characteristics API - since the underlying characteristics
class is (still hidden). Will be opened in a separate phase from the parent
class.

Bug: 31912101
Test: update-api succeeded when opening the parent class
Change-Id: Ibe2f282027cd4b1c03bfb2b1e151551c34314541
2016-11-07 09:14:46 -08:00
Etan Cohen
6571007101 Merge "[NAN-AWARE] Rename NAN to Aware"
am: 74b1131cc8

Change-Id: I2e788e19a11f2709f2e542dbdc4b58433a3574bf
2016-11-06 03:13:31 +00:00
Etan Cohen
0849ded008 [NAN-AWARE] Rename NAN to Aware
~Rename only (and any reformatting needed to pass lint) - no
functional changes!

Remove android.net.wifi.nan.STATE_CHANGED from manifest:
redundant/remnant of an older configuration.

(cherry-pick of commit a61b9fb569153917a650f1d48efa20ba8846a9f3)

Bug: 32263750
Test: All unit tests and integration (sl4a) tests pass.
Merged-In: Ie4ff675fa61041e8fcf6a9bf9900ea835d0a7614
Change-Id: I4206d2fd722dc7dec9df4aee5c818101d7f9dccc
2016-11-05 09:41:38 -07:00
Paul Stewart
e72f7dc385 Add constants for 802.11r
Add constants FT-EAP and FT-PSK, which implement 802.11r Fast
BSS Transition.

Bug: 32607043
Change-Id: Ic089bf9331723f1fce3978253437f5759c6d61e9
Test: Build (constants only)
2016-11-02 14:43:17 -07:00
Peter Qiu
bb8f3a3bbf Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree"
am: ef0cc62058

Change-Id: Id5b7771a25905d8e8e074b62c6ef70363c459d08
2016-10-26 22:30:37 +00:00
Peter Qiu
2fb7775d2a wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
am: bae4becf69

Change-Id: I2b8510cc8dc6fad443f0507a86f960ce1ae9a0d6
2016-10-26 22:28:55 +00:00
Peter Qiu
6f426e3b17 wifi: hotspot2: initial implementation of PasspointConfiguration
am: e557c35d95

Change-Id: I0ece2aef3408de46c2c92b311c78e711c09c99b9
2016-10-26 22:27:56 +00:00
Peter Qiu
2a658a152a wifi: hotspot2: omadm: add parsing support for PPS MO tree
This parser will convert a PPS MO (PerProviderSubscription Management Object)
tree XML string to a PasspointConfiguration parcelable object.

Bug: 32129686
Change-Id: Ia80b6d73828436ded57a3817f5eca7b79c618de4
Test: frameworks/base/wifi/tests/runtests.sh
2016-10-26 11:52:30 -07:00
Peter Qiu
bae4becf69 wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
The XML parser will parse an XML string into a tree-like structure
represented by XMLNode, which will be used by an object specific parser
(e.g. PerProviderSubscription Management Object tree parser) for further
processing.

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

Change-Id: I69c1931b2e8a6f3551e4eba5cffa3d2d0877872a
2016-10-26 11:52:24 -07:00
Peter Qiu
e557c35d95 wifi: hotspot2: initial implementation of PasspointConfiguration
Only support nodes under HomeSP and Credential subtree that are used
by Hotspot 2.0 Release 1.

These classes are used for data exchanges between the app and the system
service (WifiService).  All the business logics and validations will be
done on the service side (WifiService).

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

Change-Id: I6b08f52dd7b1a7b337899ab80f11d062c8e2f532
2016-10-26 10:23:09 -07:00
Peter Qiu
f97eb26db2 Merge "wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates" am: 05d950ee3b am: c1beaa3424
am: 9515f91d9e

Change-Id: Ie62a95760cefb678a5c53c9c394ee80e226563eb
2016-10-06 17:58:25 +00:00
Peter Qiu
813f48e968 Merge "wifi: add ParcelUtil for parcelizing non-parcelable objects" am: 0169a3b094 am: 5f03e24ef0
am: dfd9e7637e

Change-Id: I7f8439ef2659288c17df867f97a8185ad7b2db0d
2016-10-06 17:45:25 +00:00
Treehugger Robot
05d950ee3b Merge "wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates" 2016-10-06 17:35:33 +00:00
Treehugger Robot
0169a3b094 Merge "wifi: add ParcelUtil for parcelizing non-parcelable objects" 2016-10-06 17:21:44 +00:00
Etan Cohen
3b7703ee23 Merge "[NAN] Expose NAN characteristics as an API" am: f12c6e4f5e am: b5d18a6b11
am: 84b7932077

Change-Id: I3b7366e623b8b97b57bd73fdd618033f79225a5e
2016-10-06 04:59:23 +00:00
Etan Cohen
f12c6e4f5e Merge "[NAN] Expose NAN characteristics as an API" 2016-10-06 04:45:29 +00:00
Etan Cohen
e64c62fd02 [NAN] Expose NAN characteristics as an API
Expose NAN characteristics as an API.

(cherry-pick of commit 3a9de10963d869fa8f721432ce12785de384c560)

Bug: 31912101
Test: build and validate API updates
Change-Id: If02942d738aab8fa2f2f47489c6840af1bc38280
2016-10-05 20:00:53 -07:00
Etan Cohen
95fad688c3 Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery" am: ee1e81ec5d am: c5101c52b6
am: 97b3d99577

Change-Id: Ie9eeeb5b5a898a8b147628d8aacf1e365fa6e91a
2016-10-06 02:21:04 +00:00
Etan Cohen
2a4c81b7a7 [NAN] Add COARSE_LOCATION permission check to NAN discovery
NAN discovery can expose location based on service signatures.

(cherry-pick of commit e1d8a5a6fc3661f226afff3fde59a3eb2c06d718)

Bug: 31907534
Test: unit test + integrated (sl4a) testing
Change-Id: Iec0fae507dfdae65fe08ab6e2ddb89334c15def5
2016-10-05 15:23:21 -07:00
Etan Cohen
3a6a9a441f Merge "[NAN] Use NAN capability information to validate configurations" am: 141a2840e1 am: 6619d5b545
am: f633e57b26

Change-Id: I5a26b60dcf8a6925a62faffa63df6e274c6a5eb2
2016-10-05 05:32:59 +00:00
Etan Cohen
99997dc1ab [NAN] Use NAN capability information to validate configurations
Validate publish and subscribe configurations and message length using
the NAN configuration retrieved from the firmware.

(cherry-pick of commit 65eaa6d82170140b351d48342550a27c971d2a37)

Bug: 31912101
Test: unit tests
Change-Id: I0328cabf1aafb3f350c5fe38e6d03b0e002c693b
2016-10-04 18:37:19 -07:00
Peter Qiu
1e9dd72b64 wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates
Bug: 31834143
Test: frameworks/base/wifi/tests/runtest.sh

Change-Id: Ie013c0637e66fb970746ad8f80bca03515b72443
2016-10-04 10:18:50 -07:00
Peter Qiu
49f2684f31 wifi: add ParcelUtil for parcelizing non-parcelable objects
This CL adds the support for X509Certificate and PrivateKey objects.

Bug: 31834143
Test: frameworks/base/wifi/tests/runtest.sh

Change-Id: I1416a2aeeb0dfdd4a562d1a3b578addf55deb4ab
2016-10-04 10:18:44 -07:00