Commit Graph

1576 Commits

Author SHA1 Message Date
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
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
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 410a3498ac

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 e351176716

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
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
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
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
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
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
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
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
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
b1c9bc5ea5 Merge "wifi: hotspot2: Passpoint configuration APIs update" 2017-01-08 06:51:52 +00:00
Etan Cohen
b84ad8062d [AWARE] Remove reason from discovery session terminate callback
Only valid reason is per request (destroy or timeout/count).

Bug: 32670068
Test: unit tests & integration tests (sl4a) passing
Change-Id: I85d417442e26a16d7f09d6d2d4cbb8ae7a9eba7e
2017-01-06 16:07:41 -08:00
Etan Cohen
3de35a5e55 [AWARE] Simplify Wi-Fi Aware API namespace
Simplify Wi-fi Aware API namespace. Rely on project and remove WifiAware
prefix from most classes.

(pure rename operation: no functional changes)

Bug: 31470256
Test: unit-tests + integration (sl4a) tests.
Change-Id: I38b8137c1730c8f40c482c6770caafcaeafd5c46
2017-01-06 16:06:42 -08:00
Peter Qiu
90eb89ed06 wifi: hotspot2: Passpoint configuration APIs update
- renamed addPasspointConfiguration to addOrUpdatePasspointConfiguration
  to match the implementation of the API
- updated getPasspointConfigurations to return an empty list instead of
  a null when no configuration is installled

Bug: 33587910
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Id40185edb08910c01454c44b77957e2d5c0df722
2017-01-06 14:06:52 -08:00
pkanwar
9f47a5d85e DO NOT MERGE: Add API to indicate carrier networks.
Bug: 31003437
Change-Id: I3e3989256588f509c45e50374b8b7168589d6c5d
2016-12-21 17:39:35 -08:00
Amin Shaikh
3d18c621cb Expose ScanResult#untrusted as a @SystemApi.
- Expose ScanResult#untrusted to inform NetworkRecommendationProviders
  that a ScanResult does not correspond to a saved network.
- Add static construction methods and assertions to RecommendationResult

Test: runtest frameworks-services

Bug: 33490132
Change-Id: If7006040f63843c1c468c9d95c5c017383c5c5dd
Merged-In: If7006040f63843c1c468c9d95c5c017383c5c5dd
2016-12-21 11:46:22 -08:00
Treehugger Robot
31a8f712ab Merge "Create and implement a CacheListener inside WifiNetworkScoreCache." 2016-12-21 00:28:48 +00:00
Sundeep Ghuman
d76e65bead Create and implement a CacheListener inside WifiNetworkScoreCache.
Bug: 33041117
Test: Unit tests
Change-Id: Ic07522062f79223079b84c49210fcfc0217ecd38
2016-12-20 15:07:01 -08:00
Amin Shaikh
d3dfd3b8e9 Make WifiConfiguration#meteredHint a @SystemApi
This allows NetworkRecommendationProviders to set this field on
returned WifiConfigurations.

Test: make
Bug: 33760009
Change-Id: I4d34272a1fb8d88bcc56cf4f00d8beadd06ac603
Merged-In: I4d34272a1fb8d88bcc56cf4f00d8beadd06ac603
2016-12-20 12:46:50 -08:00
Svetoslav Ganov
e07563cc96 Add WiFi toggle prompts - framework
am: 82737b42a6

Change-Id: Ia8958b54d04fff971b96fc6d29771eb94fd9b17e
2016-12-13 16:02:23 +00:00
Sundeep Ghuman
46169f946b Copy WifiNetworkScoreCache into frameworks/base. Add tests.
Begin process of migrating WifiNetworkScoreCache.java from System Server
(//frameworks/opt/net/wifi/service/java/com/android/server/wifi/) to a
SystemApi. This CL is a straight copy and paste of
WifiNetworkScoreCache.java. Only new code is located in
WifiNetworkScoreCacheTest.java

Bug: b/33050254
Test: Unit tests added to cover most common use cases.
Change-Id: I7510420d293339ce7811fcf71a6efceb8d809c3a
2016-12-12 14:57:10 -08:00
Michael Plass
1ff5bd2646 Remove user-triggered disconnect counters
Removes these fields of WifiConfiguration:
  numUserTriggeredWifiDisableLowRSSI
  numUserTriggeredWifiDisableBadRSSI
  numUserTriggeredWifiDisableNotHighRSSI
  numTicksAtBadRSSI
  numTicksAtNotHighRSSI
  numUserTriggeredJoinAttempts

Add parcel test for WifiConfiguration.

Bug: 33013630
Test: unit tests pass
Change-Id: I39566c4e7845b01899739c36d6ec633f272fec6f
2016-12-07 08:50:10 -08:00
Etan Cohen
65617f21bf Merge "[AWARE] Fix javadocs for match filter update"
am: 7241d28826

Change-Id: I67b2798b0eb1bc7e4ccd727aad9e761da49a8823
2016-12-05 15:57:37 +00:00
Etan Cohen
7241d28826 Merge "[AWARE] Fix javadocs for match filter update" 2016-12-05 15:51:18 +00:00
Svetoslav Ganov
82737b42a6 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

Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
2016-12-05 13:52:05 +00:00
Paul Stewart
1fd6f643ac Add constants for 802.11r
am: e72f7dc385

Change-Id: I06d93c3ce96cddd6447b340304ce9fec2d4e41f2
2016-12-03 04:16:58 +00:00
Roshan Pius
f301986727 Merge changes from topic 'fast-bss-transition'
* changes:
  Add capability flag for 802.11r fast BSS transition
  Add constants for 802.11r
2016-12-02 23:57:40 +00:00
Etan Cohen
0ae58fa665 [AWARE] Fix javadocs for match filter update
Javadocs update. Specifically, cannot contain generics (since
under-the-hood generics are just the undecorated class).

Bug: 32840891
Test: generated docs (no functional change)
Change-Id: I4bc2967a60ad27d137fd5a4dd3db18625343c910
2016-12-01 16:59:41 -08:00
Etan Cohen
7f12aa5470 Merge "AWARE: Abstract structure of match filters"
am: f358a69cba

Change-Id: Ic7e87e47e9a9beebb11aa7465e4d2be9dd3e767a
2016-12-01 21:35:05 +00:00
Etan Cohen
f358a69cba Merge "AWARE: Abstract structure of match filters" 2016-12-01 15:42:35 +00:00
Stephen Chen
dfd9942a31 Merge "Add meteredOverride field to WifiConfiguration."
am: f9479fe639

Change-Id: I0d2540cf0a360f07c1dd103191fd348602099ff5
2016-12-01 03:23:32 +00:00
Treehugger Robot
f9479fe639 Merge "Add meteredOverride field to WifiConfiguration." 2016-12-01 03:08:44 +00:00
Etan Cohen
1857b982c3 AWARE: Abstract structure of match filters
Replace byte[] representation with a List<byte[]> representation
which abstracts the LV (TLV without a type field) structure of
the match filters.

Tlv utilities: remove tag indicating that will be made public API.
That is no longer expected (will be an internal utility) since the
match filter structure is now parsed when exposed to API.

Lv utilities: removed. Was a simple wrapper around Tlv utilities -
no longer needed since will not be exposed as API.

(cherry-pick of commit c9870d0d431471bf1362e46fc4f2f1bc6722896a)

Bug: 32840891
Test: unit-tests and integration (sl4a) tests passing
Change-Id: I6d792c4d7584ce002f6c11692e83e7654ef3e764
2016-11-30 17:01:52 -08:00