1618 Commits

Author SHA1 Message Date
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
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
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
Peter Qiu
7d172feb01 hotspot2: expose Passpoint APIs as public am: bffe405e1f am: b898025e8c
am: 1a8cb5dfec

Change-Id: I75201e7f464e7228458b62d9f79565097b602752
2017-02-07 23:49:35 +00:00
Peter Qiu
97f04b5efa hotspot2: fix class/function/variable names to comply with API guideline am: da8a67e8a6 am: 7fec249699
am: 57375308dc

Change-Id: I897cd2c051d7c4b3b5165114d975f5e7398f4556
2017-02-07 23:48:42 +00:00
Peter Qiu
6c3bed61c9 hotspot2: rename classes to comply with API guideline am: a77809766c am: c4f4a1ac9e
am: 9bddb8ccd8

Change-Id: I78d0edc46b89683832f26061f97f3ebebe245f93
2017-02-07 23:47:32 +00:00
Peter Qiu
bffe405e1f hotspot2: expose Passpoint APIs as public
Bug: 34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I8bf5c715b9088c673e59a73a78e18f6e6b64d1d1
2017-02-07 13:34:47 -08:00
Peter Qiu
da8a67e8a6 hotspot2: fix class/function/variable names to comply with API guideline
Bug: 34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworsk/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ide425c06be46bc41c8f601e732dca0543de096b1
2017-02-07 13:34:46 -08:00
Peter Qiu
a77809766c hotspot2: rename classes to comply with API guideline
This is purely a file rename operation.

Bug: 34862444
Test: None
Change-Id: I297a228f3ee7e09c9cce5ca9f677eb1db478fd46
2017-02-07 13:34:46 -08:00
Peter Qiu
637c407d78 Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field" am: e724f82b3d am: 281fae21f8
am: eeeb10c645

Change-Id: Ib218b76e03bb6a6082113d27ec514b03f2348b6e
2017-02-02 19:46:51 +00:00
Treehugger Robot
e724f82b3d Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field" 2017-02-02 19:29:53 +00:00
Peter Qiu
3e6c9c9462 Merge "hotspot2: implement hashCode() for classes with equals() function" am: 2ac992fcad am: 9e7725040b
am: ec61beaa7a

Change-Id: I26269af9bf18789ce40858df0645e17867f44469
2017-02-01 03:37:58 +00:00
Jeremy Joslin
499f1f39ff Merge "Print the package name and creator UID in dump()." am: cf7f9dd6a1 am: ba4bc08dae
am: 9c245a51f7

Change-Id: I33a60ce4525561705572ebaa0fe1851d46c24b63
2017-02-01 03:32:27 +00:00
Peter Qiu
ebafa7c813 Merge "hotspot2: update PasspointConfiguration APIs" am: 59da9b24ca am: 4ed5fe8191
am: 28630218cc

Change-Id: I264d4664bc9e69d9c70dce7ffcf75e3ae2e2e430
2017-02-01 03:30:58 +00:00
Treehugger Robot
2ac992fcad Merge "hotspot2: implement hashCode() for classes with equals() function" 2017-02-01 03:12:13 +00:00
Treehugger Robot
cf7f9dd6a1 Merge "Print the package name and creator UID in dump()." 2017-02-01 02:41:00 +00:00
Jeremy Joslin
711efaccd2 Print the package name and creator UID in dump().
Add a little more info to help differentiate the registered score
caches during a dump.

Test: adb shell dumpsys network_score
Change-Id: I59cb877b3237aaa85cb564795fb8a41c3d95e315
2017-01-31 14:48:01 -08:00
Peter Qiu
ddafc73496 hotspot2: implement hashCode() for classes with equals() function
According to API guideline, classes that override equals()
function should override hashCode() as well.  Make it so.

Bug: 34198926
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I4c3afed78a2fc06cdc26dd04d076f579b3472139
2017-01-31 13:26:36 -08:00
Peter Qiu
aef5b6095f hotspot2: update PasspointConfiguration APIs
Based on the API guideline, use of public variables are discouraged.
So update PasspointConfiguration and its associated classes to use
private variables with public accessor methods.

While there, cleanup unit tests to reduce code duplications.

Bug: 34627062
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I6ea45bbcf03aec01c187425a66094fad6098d75d
2017-01-31 13:26:36 -08:00
Peter Qiu
04959d48e1 wifi: WifiConfiguration: add isHomeProviderNetwork field
This is a boolean field indicating if the given WiFi network is provided
by a Passpont home provider. This is useful for the Passpoint provisioning
app to determine if the current WiFi connection is allowed to perform
Passpoint subscription or policy updates when it needs to.

This field will be set by PasspointNetworkEvaluator when generating
a WifiConfiguration for a Passpoint network.

Bug: 34467212
Test: make update-api; make -j32
Change-Id: Ia8ec2508de9658a9ee520087359ff2cd68091b63
Merged-In: I47310cda078cbf1f2d1b0a9bf79f487230fb668f
2017-01-31 11:43:14 -08:00
Peter Qiu
e7e2dc148c Merge "hotspot2: enclose conditional statement in parenthesis" am: 161ac8b006 am: ea14632665
am: 77095c33d3

Change-Id: Ib0ee84bf185ac7b492029eae791436ae30c246e2
2017-01-31 18:29:49 +00:00
Treehugger Robot
161ac8b006 Merge "hotspot2: enclose conditional statement in parenthesis" 2017-01-31 18:12:57 +00:00
Peter Qiu
55078c4fa8 hotspot2: enclose conditional statement in parenthesis
Couple unit tests are failing due to conditional statements
not enclosed in the parenthesis, which causes unexpected
returned value for the equals function.  So fix it.

Bug: 34764955
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Iaf0151803cb62eb8af308e5de40558617f84cd2f
2017-01-30 17:47:53 -08:00
Etan Cohen
4717b99a9d Merge "[AWARE] Minor hardening of manager." am: d0f1c9d1d3 am: 155d9ba6fc
am: 3e8f90a62b

Change-Id: Ia909905095094f33c536774235d49060ca2d63c3
2017-01-31 01:40:49 +00:00
Etan Cohen
275f323e86 [AWARE] Minor hardening of manager.
Callbacks are possible even if no listener was defined.
Perform a check and print error (as opposed to crashing).

Bug: 32315992
Test: unit-tests + integration tests passing
Change-Id: Ia5eb81448ace6b88abcd448e4f378da6530ac630
2017-01-30 13:09:41 -08:00
Paul Stewart
96c87f7a9b Test passing null cert/keys to WifiEnterpriseConfig am: 88b3c589ad am: cb79016b16
am: 3bac61ac86

Change-Id: I5c8af5dcd505002d815886f4a1ea30496411a35f
2017-01-28 02:01:40 +00:00
Paul Stewart
b35b219516 Account for null client certificate am: 1ca57a1d10 am: 4ad314b463
am: 25eff7731a

Change-Id: I2bd868e534ca1a5960ac9855bd40a91f705b9772
2017-01-28 02:00:50 +00:00
Paul Stewart
9c9d4f6f6d Add a client chain to WifiEnterpriseConfig am: 291ddaef78 am: cd463ff269
am: 80b5793645

Change-Id: I11310cfd06db4357ec1ee94139ebdb2e2f40f771
2017-01-28 01:59:40 +00:00
Paul Stewart
cb79016b16 Test passing null cert/keys to WifiEnterpriseConfig
am: 88b3c589ad

Change-Id: Ia92c2ad4b7562250aa69d3e8dbb3b8d8607d4136
2017-01-28 01:46:52 +00:00
Paul Stewart
4ad314b463 Account for null client certificate
am: 1ca57a1d10

Change-Id: Id999634bb25a379a5cfdb47412323d2cc6d0cd30
2017-01-28 01:45:53 +00:00
Paul Stewart
cd463ff269 Add a client chain to WifiEnterpriseConfig
am: 291ddaef78

Change-Id: Ic8451631732bd3bfce7ff08f9f37b18745cda357
2017-01-28 01:45:05 +00:00
Treehugger Robot
c71b5dab72 Merge changes from topic 'enterprise-client-chain'
* changes:
  Test passing null cert/keys to WifiEnterpriseConfig
  Account for null client certificate
  Add a client chain to WifiEnterpriseConfig
2017-01-28 01:38:31 +00:00
Paul Stewart
88b3c589ad Test passing null cert/keys to WifiEnterpriseConfig
Ensure that null certificates and keys don't crash.

Bug: 34765004
Test: This is a test
Change-Id: I439b4f985c1b88ad4a9b58ee6f4eb4f90bd81246
2017-01-27 12:48:55 -08:00
Paul Stewart
1ca57a1d10 Account for null client certificate
If a null certificate is passed to setClientKeyEntry() we should
not pass a non-null array with a single null element to the
setClientKeyEntryWithCertificateChain helper method.  Instead we
should pass a null array.

Cherry-pick of 410a3498ac28dccf69212d94a533040893c7ce0c

Bug: 34765004
Test: cts-tradefed run cts -d --module CtsNetTestCases --test android.net.wifi.cts.WifiEnterpriseConfigTest
Change-Id: I02793b4b29bc7325f98833c58bf652ba68353827
2017-01-27 12:47:20 -08:00
Paul Stewart
291ddaef78 Add a client chain to WifiEnterpriseConfig
Add a list of supporting certificates to be presented in the process
of presenting client credentials.

Cherry-pick of e3511767169357a1409119b5666c62d50e005583

Bug: 34688653
Test: Compile, unit tests
Change-Id: I6afd8baf67312e8ddaaeefd26f30dacc51aa33bb
2017-01-27 09:46:27 -08:00
Peter Qiu
245fddfd80 hotspot2: added remaining parameters to PasspointConfiguration am: ddf6fa06c6 am: 44bcb75926
am: 8badc8566a

Change-Id: I700aa39aed04e002643371b552647ada2492c6bf
2017-01-26 23:09:59 +00:00
Peter Qiu
98de3a02f5 hotspot2: add support for complete PerProviderSubscription/Policy subtree am: 2d7af45e93 am: 01e738a040
am: 6251e52cc0

Change-Id: I1305266ff24105e5b9326868f3212f8a27802fea
2017-01-26 23:09:07 +00:00
Peter Qiu
44bcb75926 hotspot2: added remaining parameters to PasspointConfiguration
am: ddf6fa06c6

Change-Id: I023acc0ae2920391de8a8de8ee95152f510ca9bd
2017-01-26 22:53:04 +00:00
Peter Qiu
01e738a040 hotspot2: add support for complete PerProviderSubscription/Policy subtree
am: 2d7af45e93

Change-Id: Icf253102520e81766e726d9247c9614b6c0ebacd
2017-01-26 22:52:11 +00:00
Treehugger Robot
0a649bffcc Merge changes If5025361,Iabe27cd8
* changes:
  hotspot2: added remaining parameters to PasspointConfiguration
  hotspot2: add support for complete PerProviderSubscription/Policy subtree
2017-01-26 22:41:19 +00:00
Peter Qiu
331f6a2b74 Merge "wifi: WifiManager API change for supporting Passpoint Release 2" am: 8150581742 am: 358fe50e4d
am: afc65709ee

Change-Id: If5b97a53b453c6ee347ce4667b3bcba4ee24dd9e
2017-01-26 20:35:03 +00:00
Peter Qiu
4f5c0ccfda wifi: WifiManager API change for supporting Passpoint Release 2
The changes include:
- Split WNM notifications intent to dedicated intent for each
  event: Deauth Imminent Notice and Subscription Remediation
- Add intent for broadcast OSU Providers List
- Update Passpoint icon intent definitions to conform to the
  API guide
- Make WifiManager#queryPasspointIcon public

All added/updated intents will required receiver to have
android.Manifest.permission.ACCESS_WIFI_STATE in order to
receive the intents.

The deprecated hidden intent definitions will be removed once
the WifiService is updated to use the new intents.

Bug: 34198926
Test: make -j32
Change-Id: If28a5710f68271069c663a953538f920512e3240
Merged-In: Ic17eef8364d79144eb530c68c6877712efcb5209
2017-01-26 10:12:19 -08:00
Peter Qiu
ddf6fa06c6 hotspot2: added remaining parameters to PasspointConfiguration
Added remaining parameters to PasspointConfiguration to support complete
PerProviderSubscription tree for Release 2 support.

The new parameters include:
- Update identifier
- Credential priority
- AAA server trust root
- Subscription update
- Subscription parameters

Bug: 34198926
Test: frameworks/base/wifi/test/runtests.sh
Change-Id: If50253612f7777b3b693a344378a2e4810b3ff47
2017-01-25 10:20:22 -08:00
Peter Qiu
2d7af45e93 hotspot2: add support for complete PerProviderSubscription/Policy subtree
Added Policy to PasspointConfiguration and the corresponding parser
support in PPSMOParser.

While there, fix a typo in node name "CertSHA256Fingerprint" under
CertificateCredential.

Bug: 34198926
Test: frameworks/base/wifi/test/runtests.sh
Change-Id: Iabe27cd83b6658ed7d4f895d7fe2255fe2094ebb
2017-01-25 10:14:37 -08:00