1959 Commits

Author SHA1 Message Date
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
1f46283dc5 Merge "hotspot2: enclose conditional statement in parenthesis" am: 161ac8b006 am: ea14632665 am: 77095c33d3
am: e7e2dc148c

Change-Id: Ib6a5a5bac5886099581e7027af74e90fa98eb35f
2017-01-31 18:35:24 +00: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
6b1c99fefe Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field" 2017-01-31 18:28:34 +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
9b07338cb2 Merge "[AWARE] Minor hardening of manager." am: d0f1c9d1d3 am: 155d9ba6fc am: 3e8f90a62b
am: 4717b99a9d

Change-Id: Ia87571d271f0dd271b40445b14bba9d05f5b34f1
2017-01-31 01:45:23 +00: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
36828f5406 Test passing null cert/keys to WifiEnterpriseConfig am: 88b3c589ad am: cb79016b16 am: 3bac61ac86
am: 96c87f7a9b

Change-Id: Iddf9cb68c3026d6fdec0550a4b7f1a6c84f6139d
2017-01-28 02:15:08 +00: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
410a3498ac 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.

Bug: 34765004
Test: cts-tradefed run cts -d --module CtsNetTestCases --test android.net.wifi.cts.WifiEnterpriseConfigTest
Change-Id: I02793b4b29bc7325f98833c58bf652ba68353827
2017-01-27 10:39:39 -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
e5373fd4b6 hotspot2: added remaining parameters to PasspointConfiguration am: ddf6fa06c6 am: 44bcb75926 am: 8badc8566a
am: 245fddfd80

Change-Id: I6c5914a16371ba123ee5ac743722c9c799c535bb
2017-01-27 00:12:22 +00:00
Peter Qiu
57f0c791ad hotspot2: add support for complete PerProviderSubscription/Policy subtree am: 2d7af45e93 am: 01e738a040 am: 6251e52cc0
am: 98de3a02f5

Change-Id: I5435de8256c81654e24c3a251df3a35893f4a0d1
2017-01-27 00:11:16 +00: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
TreeHugger Robot
17bb1b77f7 Merge "Add a client chain to WifiEnterpriseConfig" 2017-01-26 22:58:15 +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
Paul Stewart
e351176716 Add a client chain to WifiEnterpriseConfig
Add a list of supporting certificates to be presented in the process
of presenting client credentials.

Bug: 34688653
Test: Compile, unit tests
Change-Id: I6afd8baf67312e8ddaaeefd26f30dacc51aa33bb
2017-01-26 10:37:41 -08: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
TreeHugger Robot
1457cdcca5 Merge "wifi: WifiManager API change for supporting Passpoint Release 2" 2017-01-26 18:04:47 +00: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
Peter Qiu
95b89b304e Merge "hotspot2: add support for complete PerProviderSubscription/Credential subtree" am: 123aa5d8b1 am: 55d23d0829 am: c11689de2f
am: 4be45a09f4

Change-Id: I827135881dfbfa46a9566b838c1de2d1f99a0456
2017-01-25 03:30:50 +00:00
Peter Qiu
4be45a09f4 Merge "hotspot2: add support for complete PerProviderSubscription/Credential subtree" am: 123aa5d8b1 am: 55d23d0829
am: c11689de2f

Change-Id: Icb6bd9db5058b11cc27174acf616a8d751041d1d
2017-01-25 03:26:19 +00:00
Peter Qiu
ff256204e8 Merge "hotspot2: add support for complete HomeSP subtree" am: 28c7afe578 am: 6570ce6c80 am: 704f1bfea4
am: 890cc7e901

Change-Id: I56ae04669ad7e4031cef84489c84cd7230464483
2017-01-25 02:23:49 +00:00
Peter Qiu
890cc7e901 Merge "hotspot2: add support for complete HomeSP subtree" am: 28c7afe578 am: 6570ce6c80
am: 704f1bfea4

Change-Id: I0ad0256eb12fd4c255dd0c27d7ec8b90d42ccbdc
2017-01-25 02:19:45 +00:00
Peter Qiu
444dc5d099 hotspot2: add support for complete PerProviderSubscription/Credential subtree
Added missing fields in Credential subtree for supporting Release 2
and added parsing support for the new fields.

Bug: 34198926
Test: frameworks/base/wifi/test/runtests.sh
Change-Id: Ic3665c963ab77ddc4b9a03262517a3c7a4ec3ffc
2017-01-24 16:18:31 -08:00
Peter Qiu
e6e7baa600 hotspot2: add support for complete HomeSP subtree
Added missing fields in HomeSP subtree for supporting Release 2
and added parsing support for the new fields.

Bug: 34198926
Test: frameworks/base/wifi/test/runtests.sh
Change-Id: Id2766b6b48be8bd97b56eb7c57a0e8527f38e06c
2017-01-24 16:07:26 -08:00
Peter Qiu
1379fd0b1e 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: I47310cda078cbf1f2d1b0a9bf79f487230fb668f
2017-01-23 10:28:58 -08:00
Peter Qiu
4a2a0399de 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: Ic17eef8364d79144eb530c68c6877712efcb5209
2017-01-23 10:24:33 -08:00
TreeHugger Robot
09df4a6172 Merge "Expose WifiConfiguration#ephemeral is a SystemApi" 2017-01-20 21:45:00 +00:00
Amin Shaikh
9f65210780 Expose WifiConfiguration#ephemeral is a SystemApi
Bug: 34503179
Test: make
Change-Id: I3a89b89da67152bb522ae4dbfd1cfe1b4830d8ae
2017-01-20 11:26:19 -08:00
Sundeep Ghuman
5519b7b873 Add rankingScores and badges to WifiPicker.
Adds support to request scores in WifiTracker and then plumb
those scores via AccessPoint.java. AccessPoints will sort on
ranking scores. Show badging in WifiSettings picker.

Bug: 33457699, 33778046
Test: Unit tests
Change-Id: Icc3161cf147b3a9715d6e9f56af574e52ae6c832
2017-01-19 15:13:09 -08:00
Glen Kuhne
424650dd52 Merge "Unhide WifiConfiguration proxy accessors" am: c82d1ddaf4 am: d2f5fd3c42
am: 878fcfaa22

Change-Id: Ib4a59d41088ba00b21ccaeea6a9e7578c24ab8da
2017-01-18 18:57:40 +00:00
Glen Kuhne
6862d2f6c6 Unhide WifiConfiguration proxy accessors
Unhiding HttpProxy accessors in WifiConfiguration.
This change occurs in parrallel with changes that restrict updating of
WifiConfigurations with new or updated proxy info to uids
holding permission OVERRIDE_WIFI_CONFIG, or holding DeviceOwner or
ProfileOwner policies.

Bug: 14669153
Test: None
Change-Id: Id69525cfec152ea52697693f9a3bd6f86019c694
Merged-In: Id69525cfec152ea52697693f9a3bd6f86019c694
2017-01-17 15:33:12 -08:00