1884 Commits

Author SHA1 Message Date
Peter Qiu
b91d7deb96 hotspot2: update Passpoint intent definitions
Address API Councils comment on the newly added intent definitions
for Passpoint events:
- Use a Parcelable class to represent icon info
- Document all extras that are included for an action
- Document that the new intents will only be sent to registered
  receivers, and not manifest receivers
- Rename extras to be more generic

While there, removed the deprecated hidden Passpoint intent
definitions.

Bug: 35857805
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I22de2d52fce3ed1adc8d72bf1580d3337bc747c5
2017-03-09 20:46:59 -08:00
Etan Cohen
9fbff5b5d9 Merge "[AWARE] Add data-path security configuration (Passphrase)" am: 769fa0c881 am: 0501c50040
am: 08e9d52817

Change-Id: I9e2cae82179316a6768fa43a7f313c32470fd40a
2017-03-08 15:15:48 +00:00
Etan Cohen
0501c50040 Merge "[AWARE] Add data-path security configuration (Passphrase)"
am: 769fa0c881

Change-Id: If38fa15ce7c6606f081b86dad1ecbe0cac453ed5
2017-03-08 15:05:18 +00:00
Etan Cohen
62a2f9f6ab [AWARE] Add data-path security configuration (Passphrase)
Add API to optionally provide a passphrase to
configure security on a data-path.

Bug: 33552694
Test: unit tests and integration (sl4a) tests
Change-Id: Ie011345348a3918a412957e38610cabe147c35fa
2017-03-07 19:07:14 -08:00
Peter Qiu
fa308f3257 Merge "wifi: WifiConfiguration: update documentation for isHomeProviderNetwork" am: 6ac19c0d23 am: be39334afb
am: 8cf05dfe92

Change-Id: Iecbe5a8d084302a2fa8ca49495ef93df78607428
2017-03-03 19:22:10 +00:00
Peter Qiu
be39334afb Merge "wifi: WifiConfiguration: update documentation for isHomeProviderNetwork"
am: 6ac19c0d23

Change-Id: Ia4966b2d8109a85a94f59d7ec57b387a8f6f612e
2017-03-03 19:10:46 +00:00
Treehugger Robot
6ac19c0d23 Merge "wifi: WifiConfiguration: update documentation for isHomeProviderNetwork" 2017-03-03 19:02:28 +00:00
Peter Qiu
eea3e49b44 Merge "hotspot2: expose string constants for cert type and auth methods" am: 603fb2ef56 am: d919593b9d
am: 19df6d208e

Change-Id: I184f1a40a9dc854071915609dc13322d0fc86a97
2017-03-02 22:30:40 +00:00
Peter Qiu
d919593b9d Merge "hotspot2: expose string constants for cert type and auth methods"
am: 603fb2ef56

Change-Id: I6ae4811e97a99c04a423c1390d87a8c21f4ae416
2017-03-02 22:21:27 +00:00
Treehugger Robot
603fb2ef56 Merge "hotspot2: expose string constants for cert type and auth methods" 2017-03-02 22:11:01 +00:00
Paul Stewart
b26979f14e Merge "Fix up EAP-SIM documentation" am: 2142b14a88 am: 32655dfa19
am: 5e10f3d8e3

Change-Id: Idecbc5f6e85c35c8f648dda005d701bf4ebdec82
2017-03-02 00:27:33 +00:00
Paul Stewart
32655dfa19 Merge "Fix up EAP-SIM documentation"
am: 2142b14a88

Change-Id: I944734796ea97fded5cc818899ddf7b41cbeca00
2017-03-02 00:12:43 +00:00
Peter Qiu
f7303ba18e wifi: WifiConfiguration: update documentation for isHomeProviderNetwork
Address API Councils comment on documentation for isHomeProviderNetwork
field.  Specifically, the expected value for this field for non-Passpoint
network configuration.

Bug: 35855359
Test: make -j32
Change-Id: Ie6cdcc39c5156dccc14ed144e58a6d2f201aef17
2017-03-01 16:06:55 -08:00
Peter Qiu
f8dbd216c8 hotspot2: expose string constants for cert type and auth methods
So that we can use these constants in WifiService and the apps
as well in the future.

While there, remove auth method "CHAP" from the supported list,
since it is currenlty not supported by WifiService.

Bug: 34206769
Test: make -j32
Change-Id: Icadc3b13f2b135d51445d336116fbba86e96b70f
2017-03-01 16:05:52 -08:00
Treehugger Robot
2142b14a88 Merge "Fix up EAP-SIM documentation" 2017-03-02 00:01:33 +00:00
Paul Stewart
906a077cf8 Fix up EAP-SIM documentation
Address API Council comments on doucmentation for the method calls
and constants related to EAP-SIM.  While here, improve unit tests
to ensure that passing a null certificate (chain) causes the config
to forget any existing client certificates.

Bug: 35847887
Test: Unit tests

Change-Id: I1c4e18e1a7cfb61aa4764e32778793368938e70b
2017-03-01 14:02:28 -08:00
Etan Cohen
22b1dce10e Merge "[AWARE] Add data-path security configuration (PMK)" am: eff6f4fc43 am: b50d958c4a
am: 756216fdf9

Change-Id: I5cdfbac3dafeecde732ea641cfcfee34c5e376ed
2017-03-01 17:54:35 +00:00
Etan Cohen
b50d958c4a Merge "[AWARE] Add data-path security configuration (PMK)"
am: eff6f4fc43

Change-Id: I90b6324a903b6307c084c891d7eba75957e13886
2017-03-01 17:45:42 +00:00
Etan Cohen
954111a252 [AWARE] Add data-path security configuration (PMK)
Add API to optionally provide a pairwise master key (PMK)
to configure security on a data-path.

Clarify the default API to mean open (unencrypted) data-path.

Bug: 33552694
Test: unit tests and integration (sl4a) tests
Change-Id: I43fe704547f2921b3207f215e42d253837aa04e9
2017-03-01 07:35:35 -08:00
Etan Cohen
fbad632f12 Merge "[AWARE] Remove (hide) sendMessage with retryCount API" am: f81911bcd2 am: 97bf0f5e9b
am: 07864e35c8

Change-Id: Ic53ad1fed518057d75a59fd7d91dd7f4882700ce
2017-02-27 18:51:46 +00:00
Etan Cohen
97bf0f5e9b Merge "[AWARE] Remove (hide) sendMessage with retryCount API"
am: f81911bcd2

Change-Id: I3791ee5fbd0c16de6156b0ad36e50091eea498f9
2017-02-27 18:42:05 +00:00
Etan Cohen
7c9c4785fc [AWARE] Remove (hide) sendMessage with retryCount API
Remove the sendMessage(..., retryCount) API (the version
without retryCount) remains. Baseline API already retries
transmissions (at the PHY/MAC layers) - no reason to add
framework-layer retries.

Bug: 35755823
Test: unit tests and integration (sl4a) tests
Change-Id: I49d8bd1e836c09d56f3a9343313f5647eac5c32d
2017-02-24 14:17:51 -08:00
Amin Shaikh
b858ffbe42 Merge changes from topic 'disabled-reason'
am: d0fc3f1383

Change-Id: I09e7dff673a56fb3c51cde827ae783da32407a70
2017-02-23 20:35:10 +00:00
Amin Shaikh
df6f7b9388 Add a disabled reason for recommendation providers
am: a70bc57ef9

Change-Id: Ie91764892f6bd8fc20990f5a172c020a670875ff
2017-02-23 20:33:59 +00:00
Amin Shaikh
d6a62ed405 Fix failing WifiConfigManagerTest test.
Bug: 35671673
Test: runtest frameworks-core frameworks-wifi
Change-Id: I55ff41464cabfb97d03a0758d73145df808ec2c8
Merged-In: I55ff41464cabfb97d03a0758d73145df808ec2c8
2017-02-23 10:29:10 -08:00
Amin Shaikh
34cfdb26a6 Fix failing WifiConfigManagerTest test.
Bug: 35671673
Test: runtest frameworks-core frameworks-wifi
Change-Id: I55ff41464cabfb97d03a0758d73145df808ec2c8
2017-02-23 10:08:10 -08:00
Amin Shaikh
a70bc57ef9 Add a disabled reason for recommendation providers
Display a message indicating that a saved networks has not been
automatically connecting due to low quality if
WifiConfiguration#mNotRecommended is set.

Bug: 34745259
Bug: 35671673
Test: m RunSettingsLibRoboTests && runtest frameworks-wifi
Change-Id: I275e2711da68715fb6d92bf954e9f58a3386b1f4
Merged-In: I275e2711da68715fb6d92bf954e9f58a3386b1f4
2017-02-22 15:18:28 -08:00
Etan Cohen
55e5cec71b Merge "[AWARE] Remove enableUsage/disableUsage API" am: 647f2e1493 am: 8e32c1b718
am: 313b7c3613

Change-Id: I4382b1f5e25a15a96a1bca7e1492d3d1791c093e
2017-02-17 22:36:42 +00:00
Etan Cohen
6721901c4d Merge "[AWARE] Add discovery window period configuration" am: 17532ec02e am: f8637d5c04
am: 2fd54ee28a

Change-Id: Iba971429f57c90e0397e06f4d679ef2e3e660f41
2017-02-17 22:33:35 +00:00
Etan Cohen
8e32c1b718 Merge "[AWARE] Remove enableUsage/disableUsage API"
am: 647f2e1493

Change-Id: Ic48804f3e2ecac6a817d261f9f9cbfc505b01716
2017-02-17 22:18:32 +00:00
Etan Cohen
f8637d5c04 Merge "[AWARE] Add discovery window period configuration"
am: 17532ec02e

Change-Id: I62ba5123aafb236d756a4cafe7829717e8e542f9
2017-02-17 22:15:29 +00:00
Etan Cohen
647f2e1493 Merge "[AWARE] Remove enableUsage/disableUsage API" 2017-02-17 21:33:40 +00:00
Amin Shaikh
98773d4837 Add a disabled reason for recommendation providers
Display a message indicating that a saved networks has not been
automatically connecting due to low quality if
WifiConfiguration#mNotRecommended is set.

Bug: 34745259
Test: m RunSettingsLibRoboTests && runtest frameworks-wifi
Change-Id: I275e2711da68715fb6d92bf954e9f58a3386b1f4
2017-02-17 08:49:16 -08:00
Etan Cohen
6bb624a532 [AWARE] Add discovery window period configuration
Discovery window period configuration modifies the duty cycle of
the Aware discovery session. Allowing trade-offs of discovery
latency vs. power.

Add the configuration.

Note: the whole ConfigRequest object is not public (at this point)
so by default so is the new configuration.

Bug: 33552536
Test: unit tests and integration (sl4a) tests.
Change-Id: I16f5c084dbc91431763a81de0a3adfe6f452e44c
2017-02-16 18:38:23 -08:00
Etan Cohen
416d6fba17 [AWARE] Remove enableUsage/disableUsage API
The APIs (never public) were provided for indirect access to enable
or disable Aware usage. No longer necessary.

Bug: 35435032
Test: unit tests and integration (sl4a) tests
Change-Id: Ia5c2b8aed8dd908f49b5e4f42a77feed3cda946c
2017-02-16 14:13:42 -08:00
Ningyuan Wang
58e6fe321f Merge "Create createFromByteArray() for WifiSsid" am: fb19d8d7c1 am: 18b3a7f586 am: 9d1be09462
am: c2c718b717

Change-Id: I82b27a1b4f0891d1153efdfb0058fe10b533316c
2017-02-14 02:32:04 +00:00
Ningyuan Wang
c2c718b717 Merge "Create createFromByteArray() for WifiSsid" am: fb19d8d7c1 am: 18b3a7f586
am: 9d1be09462

Change-Id: If221ae36424377501677f70a3601509328268604
2017-02-14 02:28:30 +00:00
Ningyuan Wang
fb19d8d7c1 Merge "Create createFromByteArray() for WifiSsid" 2017-02-14 02:13:34 +00:00
Ningyuan Wang
a6ea570a4a Create createFromByteArray() for WifiSsid
Bug: 35318006
Test: compile, unit tests
Change-Id: I0138bd67c0dec37419897318401b18ee4445a111
2017-02-13 15:40:19 -08:00
Peter Qiu
bfceb41f5d Merge "hotspot2: fix typo in the getter functions" am: d3146f3c3c am: 5644c190a0
am: 1b510ecff7

Change-Id: I56f99259149adb6a5e2fda7e2bbf8093a528a675
2017-02-13 20:12:20 +00:00
Treehugger Robot
d3146f3c3c Merge "hotspot2: fix typo in the getter functions" 2017-02-13 19:49:51 +00:00
Paul Stewart
edb9b8df23 Merge "Allow EAP-SIM authentication methods under PEAP" am: e690e0178c am: 549c3fc0da
am: bdfb1b86d3

Change-Id: I083778d8867e79b1a2c04166811508a6642a9c68
2017-02-11 02:52:44 +00:00
Paul Stewart
e613fccb56 Allow EAP-SIM authentication methods under PEAP
Extend the PEAP outer method to contain EAP-SIM innner methods
so these transactions can be encrypted.

Cherry-pick of 68c63024c2ace87921c1e84a99d18dae6001c74c

Bug: 34835771
Test: Unit tests

Change-Id: I4931ed43e396c93bad0bfce1750291982f8cd146
2017-02-10 16:15:52 -08:00
Sundeep Ghuman
328daab62f Fix error logging level in WifiNetworkScoreCache.
Bug: 35143659
Test: NA
Change-Id: Ibae6ccdacd9eef3b8ccc940489eaaeed0eeb9b8b
2017-02-09 18:02:58 -08:00
Roshan Pius
ec38eb6988 WifiManager: API upates for O am: fb441f5009 am: aabb1c7ecf
am: 02bf13a6c9

Change-Id: I75883c53958f2495a3e906a8940ef2a7ced98ec5
2017-02-08 21:07:48 +00:00
Roshan Pius
6a4322b6d6 WifiConfiguration: Remove priority field am: 45491113ed am: 51641c20b2
am: 707ced526f

Change-Id: I294a36db16c8e079cae5b748421dccfbb50dadc4
2017-02-08 21:06:45 +00:00
Peter Qiu
701a4b55c9 hotspot2: fix typo in the getter functions
Bug: 34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: If833fb06cead7df9d631b3b12d66d05b8422d46c
Merged-In: If833fb06cead7df9d631b3b12d66d05b8422d46c
2017-02-08 20:59:02 +00:00
Peter Qiu
8dee619860 hotspot2: fix typo in the getter functions
Bug: 34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: If833fb06cead7df9d631b3b12d66d05b8422d46c
2017-02-08 11:01:43 -08:00
Roshan Pius
fb441f5009 WifiManager: API upates for O
Deprecate the following API's:
1. pingSupplicant() - We don't want apps trying to figure out if
wpa_supplicant is running or not. It should not be something that
apps need to know.
2. saveConfiguration() - No longer needed, we automatically persist data
when needed.

Other changes:
1. Reworded the docstrings to remove direct reference to wpa_supplicant
for network configuration related API's.
2. We no longer allow apps to modfiy network configuration of other
apps. Added a docstring explaining that in the 3 modify API's.
3. Changed the wording of enableNetwork's |disableOthers| flag.

Bug: 31146757
Test: make update-api
Change-Id: If970d85146de3532072191cb2b7ecb0d5adb2774
2017-02-08 08:51:26 -08:00
Roshan Pius
45491113ed WifiConfiguration: Remove priority field
This field is no longer used anywhere within wifi framework and hence
removing this from public API.

Bug: 28341078
Test: make update-api
Change-Id: I5bd115742ca610735b00c20f2ffab7590c5f3256
2017-02-08 08:50:29 -08:00