1943 Commits

Author SHA1 Message Date
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
Glen Kuhne
3cdde18e3c Merge "Unhide WifiConfiguration proxy accessors" 2017-01-17 21:38:29 +00:00
Randy Pan
850e37811e Merge "Keep WIFI_FEATURE defines in sync with HAL" am: cdad7f334b am: 9db7223591 am: 3d12f1b928
am: d061cf5f6c

Change-Id: I1724e30ef5af246ddf5056533b3bc0321267a505
2017-01-17 19:21:59 +00:00
Randy Pan
d061cf5f6c Merge "Keep WIFI_FEATURE defines in sync with HAL" am: cdad7f334b am: 9db7223591
am: 3d12f1b928

Change-Id: Id2d352f1f774a78bf389b6927591c778bb8eb072
2017-01-17 19:07:59 +00:00
Randy Pan
438643b151 Keep WIFI_FEATURE defines in sync with HAL
Bug: 33673826
Test: build
Change-Id: Ifec7b28ef7b08a478d889d40d13b45f3a60a7e07
2017-01-13 14:59:30 -08:00
pkanwar
07998e8e26 DO NOT MERGE: Fix to maintain the Carrier Network connection.
am: e45b50293e

Change-Id: I6a48b308cd461097a195a073249cde096cc74886
2017-01-13 20:58:09 +00:00
pkanwar
e45b50293e DO NOT MERGE: Fix to maintain the Carrier Network connection.
Added isCarrierNetwork param in WifiConfiguration, which is then used in
WifiStateMachine. After this change, the connection to Carrier Network
should be maintained.

BUG: 30760683
Change-Id: I88e01ff44f494a6eda5e2e8a088d069638b72c89
2017-01-12 19:25:52 -08:00
Sundeep Ghuman
23ccbcd404 Modify WifiNetworkScoreCache to print full Score.
Test: dumped network_score and verified printout
Change-Id: I3689449db91e8c5e96bed349749f074c5626bd03
2017-01-12 01:44:24 -08:00
Stephen Chen
58ddbd76bb Expose WifiManager#connect and ActionListener as @SystemApi
This is needed by Wifi Wakeup and Notifications which live within
NetworkRecommendation package.

Bug: 33224871
Test: GTS
Change-Id: If4f1f9957f82b1292af4187c7728cbccab0184e8
Merged-In: If4f1f9957f82b1292af4187c7728cbccab0184e8
2017-01-11 21:51:36 -08:00
Etan Cohen
7a36073c14 Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13 am: 2a4e3bef2c am: b32dfa4ef5
am: 3fc5b186fa

Change-Id: Ib668ed15ccf1f05c5ed31f700b69e1f3ab8b4cac
2017-01-11 23:28:20 +00:00
Etan Cohen
6a4b323f08 [AWARE] Unhide Wi-Fi Aware API (baseline)
Baseline Wi-Fi Aware API providing discovery and connectivity (data-path).

Bug: 30983968
Test: unit tests + integration (sl4a) tests passing.
Change-Id: Idd7c6a625f168717b083d5f13e291ce916571933
2017-01-11 11:13:26 -08:00
Glen Kuhne
1375ede092 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
2017-01-10 15:15:17 -08:00
Amin Shaikh
bdc89f99ea Expose fields in WifiConfiguration.
hasNoInternetAccess and isNoInternetAccessExpected are key signals needed
to determine whether Wi-Fi should be woken up for a given saved network.

Test: make
Bug: 33224312
Change-Id: I3f48735ebae72e15fbdb0a3057cf7c71fb0cc307
Merged-In: I3f48735ebae72e15fbdb0a3057cf7c71fb0cc307
2017-01-09 18:47:46 +00:00
TreeHugger Robot
1fe396f67d Merge "Expose WifiManager#connect and ActionListener as @SystemApi" 2017-01-09 18:46:14 +00:00
TreeHugger Robot
09ca5f52a0 Merge "Expose fields in WifiConfiguration." 2017-01-09 18:39:34 +00:00
Amin Shaikh
5ac6650d4a Expose fields in WifiConfiguration.
hasNoInternetAccess and isNoInternetAccessExpected are key signals needed
to determine whether Wi-Fi should be woken up for a given saved network.

Test: make
Bug: 33224312
Change-Id: I3f48735ebae72e15fbdb0a3057cf7c71fb0cc307
2017-01-08 22:29:51 -08:00
Peter Qiu
589fe00655 Merge "wifi: hotspot2: Passpoint configuration APIs update" am: b1c9bc5ea5 am: fdbc827a52 am: 5549acb0e6
am: fc9579cfda

Change-Id: I5d9166a297b1fdb16d14fcd7eb83866e1be5606a
2017-01-08 10:05:27 +00:00