1962 Commits

Author SHA1 Message Date
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
Treehugger Robot
b1c9bc5ea5 Merge "wifi: hotspot2: Passpoint configuration APIs update" 2017-01-08 06:51:52 +00:00
Etan Cohen
d8fa1bb1f3 Merge "[AWARE] Remove reason from discovery session terminate callback" am: bbbe5e6ccd am: dce01e235b am: baf9bb8563
am: 8bad14363e

Change-Id: I545524b640fc1fbef547b0006fa6288bc45be7c1
2017-01-07 20:34:49 +00:00
Etan Cohen
9a26e434ba Merge "[AWARE] Simplify Wi-Fi Aware API namespace" am: 834a87d525 am: fd23421472 am: 0bad91b5ac
am: 0232d18805

Change-Id: Ibdb559206159eb840810f55f51545cdc797d16d6
2017-01-07 18:48:10 +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
Stephen Chen
32f73c0f4e 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
2017-01-06 15:34:28 -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
Sundeep Ghuman
dfd5049246 Merge "Fix failing WifiNetworkScoreCacheTest." am: 5e055b6a18 am: 80f1e2e52a am: 43e86c1ca6
am: f44bea51fb

Change-Id: Ia1ce5ee294b75f5169926492749e31e8a62825a7
2016-12-22 19:42:28 +00:00
Sundeep Ghuman
f44bea51fb Merge "Fix failing WifiNetworkScoreCacheTest." am: 5e055b6a18 am: 80f1e2e52a
am: 43e86c1ca6

Change-Id: If7acfafd1cb8e52b778cf8fb347e1a0d509d7f62
2016-12-22 19:27:29 +00:00
pkanwar
aa4d204be7 DO NOT MERGE: Add API to indicate carrier networks.
am: 9f47a5d85e

Change-Id: Ib0ed3283a55ec285cafa1f120a8545956e27c242
2016-12-22 18:04:42 +00: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
Sundeep Ghuman
0a5b3e2fe9 Fix failing WifiNetworkScoreCacheTest.
There was a NPE thrown by an unintialized mock.

Bug: 33818187
Test: Android unit tests
Change-Id: I478885dcebaf41f93488a6a12bb83652ad462be5
2016-12-21 16:44:46 -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
Sundeep Ghuman
09f062b3c1 Merge "Create and implement a CacheListener inside WifiNetworkScoreCache." am: 31a8f712ab am: 6d749fb489 am: c5443c1d5c
am: 2d68d1a13c

Change-Id: I118293afd44dd619c0c039d4aef9c2f22bda338c
2016-12-21 01:01:20 +00: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
TreeHugger Robot
0e4b9cd97d Merge "Expose ScanResult#untrusted as a @SystemApi." 2016-12-20 22:30:35 +00: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
Amin Shaikh
f9d47b79b2 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
2016-12-20 12:22:08 -08:00
Amin Shaikh
14965357b7 Make WifiConfiguration#meteredHint a @SystemApi
This allows NetworkRecommendationProviders to set this field on
returned WifiConfigurations.

Test: make
Bug: 33760009
Change-Id: I4d34272a1fb8d88bcc56cf4f00d8beadd06ac603
2016-12-20 11:00:34 -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
5aea94e128 Copy WifiNetworkScoreCache into frameworks/base. Add tests. am: 46169f946b am: e436024c65 am: c600c4058b
am: e4fb9aaa3f

Change-Id: I311fb02b2d0a2f12a0f76411de61074145b9077e
2016-12-13 02:35:09 +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
f47437fd8b Merge "Remove user-triggered disconnect counters" am: 2007ee8de3 am: b8d3324bb7 am: 2c106012fe
am: 88f6752547

Change-Id: Ie2d0a341db570e2fb807da3b8ff7a049c055c49f
2016-12-07 23:21:49 +00: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
fc3d4896aa Merge "[AWARE] Fix javadocs for match filter update" am: 7241d28826 am: 65617f21bf am: 4c43aba36e
am: 4f6b7f87f8

Change-Id: I5c15d5915d5fd7ce84d150986af1f8d45b9a65dc
2016-12-05 16:14:19 +00: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