1698 Commits

Author SHA1 Message Date
Etan Cohen
ba4a81b363 Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions" am: 47502919ad am: ad299d38ff am: 1c92763087
am: 1f5d3014c5

Change-Id: I1f874e790b35686968f6c54f668db0cd996b6f70
2016-11-30 17:30:23 +00:00
Etan Cohen
ad299d38ff Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions"
am: 47502919ad

Change-Id: If8f7d8e0e039d2d9961de84e5aa8693448b77a26
2016-11-30 17:08:32 +00:00
Etan Cohen
1ddf6a6d3a [AWARE] Data-path creation roles hard-coded for discovery sessions
Data-path roles (initiator & responder) are hard-coded for discovery
session participants by the spec: subscriber <-> initiator and
publisher <-> responder. Remove API parameter which allowed caller
to specify role.

(cherry-pick of commit 9c7483fec41db681a2d6de93a9061fb8764ecba5)

Bug: 32883026
Test: unit-tests and integration (sl4a) tests passing.
Change-Id: I889eacda9416d9ecd04caa0c72413f984611d40c
2016-11-30 07:10:42 -08:00
Etan Cohen
260823eba4 Merge "[AWARE] Move manager tests from service to manager directory" am: 018f6ec16f am: f74733a367 am: cd4be8b7e0
am: 28d58e1c95

Change-Id: Ie6ea910839b577914e56b0718345e45db16ab146
2016-11-24 00:19:16 +00:00
Etan Cohen
f74733a367 Merge "[AWARE] Move manager tests from service to manager directory"
am: 018f6ec16f

Change-Id: I795e75882ac702c3637afa43ba2f73d612d74661
2016-11-23 23:50:27 +00:00
Etan Cohen
b77b69545e [AWARE] Move manager tests from service to manager directory
Move operation - no functional tests. Only editorial changes:
- Remove (no longer) necessary import statements
- Removed reference to a constant sitting on the service side.
  Replaced with locally defined constant.

(cherry pick of commit 7ba5ad3c53dac62e56cd12dbe2054ce8374b6b92)

Bug: 32954930
Test: unit-tests pass
Change-Id: Ibe463fa73c27fc67996460eb91ea0222437927a6
2016-11-23 10:28:09 -08:00
Peter Qiu
028f18d340 Merge "wifi: hotspot2: add copy constructor for PasspointConfiguration" am: 248c8311e8 am: 3aa7fdd19a am: 5366e9bf71
am: f598da48f2

Change-Id: I005042e2acf5f53fd70373443f7763b68d783f0f
2016-11-22 17:52:57 +00:00
Peter Qiu
3aa7fdd19a Merge "wifi: hotspot2: add copy constructor for PasspointConfiguration"
am: 248c8311e8

Change-Id: I9a652a0f02f2895bde3ac9e4c332c80fc38b0df6
2016-11-22 01:37:00 +00:00
Treehugger Robot
248c8311e8 Merge "wifi: hotspot2: add copy constructor for PasspointConfiguration" 2016-11-22 00:03:43 +00:00
Etan Cohen
43518242a3 Merge "[AWARE] Update API per review" am: 9e4f111e0f am: ce7f932be7 am: 86cd994a15
am: 355e52215f

Change-Id: I0f334e1db798bdfcadb4547d7edda5200e160b43
2016-11-21 23:07:34 +00:00
Etan Cohen
ce7f932be7 Merge "[AWARE] Update API per review"
am: 9e4f111e0f

Change-Id: I69001477d02c612540ff74385400551293f7c600
2016-11-21 21:50:34 +00:00
Etan Cohen
6831f93725 [AWARE] Update API per review
- Move Handler to last position
- Peer ID changed from 'Object' -> opaque class
- Rename onMessageSent -> onMessageSendSucceeded

(cherry pick of commit 1fef08507aeb49bb2e4e7be4804a378ba2cf7770)

Bug: 31470256
Test: unit tests & integration (sl4a) tests pass
Change-Id: I5530d310e982ea16a63a5af1f704625fd24e436c
2016-11-21 18:23:39 +00:00
Peter Qiu
42efc4ba7a Merge "wifi: hotspot2: add support for validating passpoint configuration" am: ebb722d04a am: 8bbb583ff7 am: 1b3a17c280
am: b011af9573

Change-Id: I7c45b558c87e4c24083f82ea69c7584668fb15aa
2016-11-18 09:10:43 +00:00
Peter Qiu
8bbb583ff7 Merge "wifi: hotspot2: add support for validating passpoint configuration"
am: ebb722d04a

Change-Id: Ic20a77103961bd9ff61b6af90130c25ad19c451a
2016-11-18 08:54:11 +00:00
Treehugger Robot
ebb722d04a Merge "wifi: hotspot2: add support for validating passpoint configuration" 2016-11-18 08:45:15 +00:00
Peter Qiu
8b75eeef42 Merge "wifi: add constant definition for EAP types" am: a908e65b66 am: 40dfd2d0bc am: 120cb677f0
am: 9562122699

Change-Id: I3840e74b17bfe22b8b62597b6f98c4cee79e14f1
2016-11-17 19:02:30 +00:00
Peter Qiu
40dfd2d0bc Merge "wifi: add constant definition for EAP types"
am: a908e65b66

Change-Id: I283fba81ca5246222bda07f7f109d2f359e5e395
2016-11-17 02:21:41 +00:00
Treehugger Robot
a908e65b66 Merge "wifi: add constant definition for EAP types" 2016-11-17 02:10:23 +00:00
Ningyuan Wang
4a4213845b Merge "Add security capabilities enums to ScanResult" am: a3c0324824 am: 6e67bb87cf am: 7cad272109
am: 5f72d153aa

Change-Id: Idf96f8abaed98608d8252484e9eba86d669ac7d4
2016-11-17 00:22:06 +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
c6d760ba1e wifi: remove unused hidden Hotspot 2.0 Release 1 API am: 1c3054ea87 am: 1b39c61ce7 am: 134706940b
am: 03e4bc1ead

Change-Id: Ia56fb25083513ff82cda7f66f5617d02b81e96ec
2016-11-16 00:42:16 +00:00
Peter Qiu
35d842ef22 wifi: remove hidden unused Hotspot 2.0 Release 2 APIs am: a38558b539 am: a9a9a9bb8d am: 31b8e658d3
am: 996986254f

Change-Id: I647413dfcfd9dc769c484a4fa7e7eae13c66e0a0
2016-11-16 00:41:13 +00: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
Sohani Rao
e6a69fcd63 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
2016-11-10 15:49:00 -08:00
Peter Qiu
7bfba3a507 Merge "wifi: hotspot2: add Passpoint APIs to WifiManager" am: 0295d7bd38 am: 5451f8279e am: 8e07f4a86e
am: 6405b98114

Change-Id: Ifb223a9c0573571875979a7f55e6ede53ac12a4e
2016-11-10 22:43:59 +00: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
9e90a426c2 Merge "wifi: hotspot2: add support for parsing Release 1 installation file" am: 44e817fdcf am: 861e99e815 am: 861619e782
am: e0ebb9ce31

Change-Id: If6486ed34e20f225b588fcae0a32ca41c1531786
2016-11-10 20:43:05 +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
2a2d614f88 Merge "Wifi Tx/Rx rate computation" am: bccf93311c am: 33600a3d38 am: e929425a9e
am: 6332104fbc

Change-Id: I10ae42879d7a4c7001583bfac2f835264c90ff2e
2016-11-10 16:46:02 +00: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