1957 Commits

Author SHA1 Message Date
Christopher Wiley
79ec1736be Remove WifiManager#get/setFrequencyBand
These methods are marked @hide and only partially implemented by
the WifiService.  In general, it seems wrong to strictly prefer
one WiFi band over another for all WiFi operations.  To reduce
implementation complexity, cause setFrequencyBand to become a noop
and getFrequencyBand to reflect the underlying reality, which is
that we will always operate on all supported bands.

Bug: 31148223
Test: Compiles
Change-Id: Iccff517915f7d5ed7e96bf56e4f195b2cda80f0a
2016-09-20 15:33:38 -07:00
Etan Cohen
b7f1a665b5 Merge "[NAN] Rename to make discovery explicit" am: 5706a8f535 am: eb4c838c46
am: ad864c8fd9

Change-Id: I338cd7ddf54997bdf19a95056e5793103ffc2e23
2016-09-20 17:07:31 +00:00
Etan Cohen
5706a8f535 Merge "[NAN] Rename to make discovery explicit" 2016-09-20 16:41:04 +00:00
Rebecca Silberstein
683bc64b6b Merge "WifiScanner: retrieve single scan results" am: 3c70a2fad2 am: c507bcaf63
am: 6d2cca0f43

Change-Id: I1fd17ac75a6bd69cbe775b8d202f1520750006b6
2016-09-20 16:10:12 +00:00
Rebecca Silberstein
3c70a2fad2 Merge "WifiScanner: retrieve single scan results" 2016-09-20 15:50:08 +00:00
Etan Cohen
ed40a56e8f Merge "[NAN] Update API: replace looper with handler" am: 0027ddf990 am: c074f1bb7f am: 82842e8223
am: 1173c27fdf

Change-Id: I4f81d0da47d13cb4a417ae97f51552b6eefe0581
2016-09-20 06:20:24 +00:00
Etan Cohen
1173c27fdf Merge "[NAN] Update API: replace looper with handler" am: 0027ddf990 am: c074f1bb7f
am: 82842e8223

Change-Id: I51b625ca4f3ae18b3331830cce1bb2653893c5be
2016-09-20 00:34:30 +00:00
Etan Cohen
3855370c24 [NAN] Rename to make discovery explicit
Pure rename operation - no other functional changes.

(cherry-pick of commit ddb5f646562f31d7e78778a978e546f85312b009)

Bug: 31470256
Test: unit tests, integrated (sl4a) tests.
Change-Id: I5110d1a673b7ba4e39350d723b5984586fec585a
2016-09-19 21:52:14 +00:00
Etan Cohen
0fbeb0543e [NAN] Update API: replace looper with handler
Per API council guidelines.

(cherry-pick of commit 0ff5bf0092eb25f579e2e93fb2f93bc953b39211)

Bug: 31377060
Test: unit tests, integrated (sl4a) tests
Change-Id: I05142001fb593399fb4675fbec965d7e08e0fac1
2016-09-19 20:47:15 +00:00
Etan Cohen
75e324f44f Merge "[NAN] Make parcelable class final - per API linter" am: 3fcabac35a am: 5a07e3b2e8 am: eb1c7afdcf
am: ff64f55acb

Change-Id: I8ae44b6f28d8e6a2c7e2e311b8404d6d089d4f50
2016-09-19 16:31:29 +00:00
Etan Cohen
ff64f55acb Merge "[NAN] Make parcelable class final - per API linter" am: 3fcabac35a am: 5a07e3b2e8
am: eb1c7afdcf

Change-Id: If0f1f4de0fd28c0c65cb46bd958b99f76fed854b
2016-09-19 16:25:31 +00:00
Etan Cohen
8c3354f719 [NAN] Make parcelable class final - per API linter
(cherry-pick of feef60406e961afcda8893c7560382382c358910)

Bug: 31380952
Test: build + sl4a integration test (WifiNanManagerTest:test_nan_discovery_session)
Change-Id: I74c079763d6b3a4f0119b16acd7a18014a10ebbd
2016-09-19 14:09:42 +00:00
Rebecca Silberstein
bfc76e0646 WifiScanner: retrieve single scan results
Add a new CMD_GET_SINGLE_SCAN_RESULTS message type and
getSingleScanResults method that allow WifiService to get
scan results directly from WifiScanner.

BUG: 31444878
Test: manually tested on angler
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh on angler
Test: ran GTS CtsNetTestCases on angler
Change-Id: I705233d7dc4ae7e8480c53ff0f9e1b6c8875fecb
2016-09-17 01:38:33 -07:00
Roshan Pius
88262f3650 Merge "WifiScanner: Change hidden/PNO scan params" am: b1161c83f9 am: afef95d3c5 am: 821cc37981
am: 6738608ac5

Change-Id: Ief5ad973c356ab1c8f507f64bdb0f38b9d4080e5
2016-09-17 00:02:07 +00:00
Roshan Pius
6738608ac5 Merge "WifiScanner: Change hidden/PNO scan params" am: b1161c83f9 am: afef95d3c5
am: 821cc37981

Change-Id: I4dd242caec0ee68cba67b1da85e83e53e6780286
2016-09-16 23:34:58 +00:00
Roshan Pius
8da6bdc2d3 WifiScanner: Change hidden/PNO scan params
Since networks are no longer configured in wpa_supplicant, network
IDs/priorities being passed around for hidden/PNO scanning does not
make any sense.
Changing the wifi scanner interface to remove all network ID/priority
references. These will be replaced by SSID of the corresponding
networks for hidden networks.

BUG: 29503772
TEST: Existing unit tests.
TEST: Successfully connected to a hidden network on device
Change-Id: I5d877e0345d574fb513b6eecca14f65f2ee4e7ab
2016-09-14 09:15:41 -07:00
Mitchell Wills
9ca8427bde Merge "Add a flag to indicate if a ScanData is for a scan for all channels" am: c7b84e6d0d am: d8a5904abe am: cb38f6fbb8
am: 5bf755a354

Change-Id: I1c71151d902a06d39ada5e5951b025c26367f1f5
2016-09-14 05:30:13 +00:00
Mitchell Wills
5bf755a354 Merge "Add a flag to indicate if a ScanData is for a scan for all channels" am: c7b84e6d0d am: d8a5904abe
am: cb38f6fbb8

Change-Id: Ib1bfd6d4a06548351c8215cc995dee7f6de2862c
2016-09-12 21:19:49 +00:00
Mitchell Wills
9bc78e8a25 Add a flag to indicate if a ScanData is for a scan for all channels
BUG=30897947

Change-Id: I919d7fa9c3bf196371e506d23e393a9d609a5b4b
(cherry picked from commit 4bfb391c91b3539d2ec20ffd7e01056dafa0984d)
2016-09-12 11:28:55 -07:00
Roshan Pius
f4e1ca7471 Merge "WifiManager: Remove unused methods" am: efb7bec56a am: 718c90daf1 am: 4898225abc
am: 186159de58

Change-Id: Ib934238d344f206990a31d99cf79e299e8fe8160
2016-09-07 23:08:07 +00:00
Roshan Pius
186159de58 Merge "WifiManager: Remove unused methods" am: efb7bec56a am: 718c90daf1
am: 4898225abc

Change-Id: I7bc7504eaa93b25d6aec1b4b5e337a14085639e7
2016-09-07 22:02:59 +00:00
Treehugger Robot
efb7bec56a Merge "WifiManager: Remove unused methods" 2016-09-07 21:43:20 +00:00
Roshan Pius
5b6b6426c9 Merge "WifiEnterpriseConfig: Refactor set/get field values" am: c4856bd73c am: 655ae32d57 am: 32f3a3f940
am: 8a9dcc81d4

Change-Id: I8495d09b343f97a0aca8b9f717890070046c7c4f
2016-09-07 16:10:36 +00:00
Roshan Pius
8a9dcc81d4 Merge "WifiEnterpriseConfig: Refactor set/get field values" am: c4856bd73c am: 655ae32d57
am: 32f3a3f940

Change-Id: Iba70f027e1de751c95142b9515898b226089569a
2016-09-07 16:05:31 +00:00
Roshan Pius
c4856bd73c Merge "WifiEnterpriseConfig: Refactor set/get field values" 2016-09-07 15:47:40 +00:00
Roshan Pius
d98aba973e Merge "WifiConfiguration: Fix isEnterprise" am: 9221c96ae0 am: e597198f12 am: 478bb2b44d
am: d74f710e25

Change-Id: I0f66eafb5129308674c0eceb4b8699bb4a32dd88
2016-09-06 23:46:28 +00:00
Roshan Pius
d74f710e25 Merge "WifiConfiguration: Fix isEnterprise" am: 9221c96ae0 am: e597198f12
am: 478bb2b44d

Change-Id: I4981990a4dc3aa1dde70625b93798a2fd6ff8263
2016-09-06 23:21:41 +00:00
Mitchell Wills
4bfb391c91 Add a flag to indicate if a ScanData is for a scan for all channels
BUG=30897947

Change-Id: I919d7fa9c3bf196371e506d23e393a9d609a5b4b
2016-09-06 15:08:36 -07:00
Roshan Pius
6cfe668c80 WifiManager: Remove unused methods
Remove the unused hidden methods from WifiManager.

BUG: 29449615
TEST: Compiles, boots up.
Change-Id: Ie7e6f438b23a368e44d35390267d5505e12bb75e
2016-09-06 13:38:31 -07:00
Roshan Pius
29ce1dab5a WifiConfiguration: Fix isEnterprise
Add a check for the eap method in Enterpriseconfig associated with the
WifiConfiguration.

BUG: 31275240
Change-Id: I21aabb09bdd21e29a80d4b9c6ea0e2b1f0d7e2df
2016-09-06 10:13:40 -07:00
Roshan Pius
c8cd577c86 WifiEnterpriseConfig: Refactor set/get field values
WifiEnterpriseConfig has a few keys which are generated internally
have unquoted values. However, the public setFieldValue() always quotes
the value when set.  So, this causes a problem when restoring
these field values from config store. Since this is an internal
disctinction that only WifiEnterpriseConfig understands, add a list to
check if a particular field value needs to be quoted or not. Also,
remove any direct "mFields.put" invocations with |setFieldValue|.

While there,
Refactor the existing |setFieldValue| & |getFieldValue| methods.

BUG: 31246524
TEST: Unit tests
TEST: Integrated with config store and verified that a previous TLS EAP
connection failure is no longer seen.

Change-Id: Ib85f3bce378720a6a6c2ae1439837a8e866a088d
2016-09-06 10:05:02 -07:00
Roshan Pius
79daf5bc39 Merge "WifiEnterpriseConfig: Fix copy constructor" am: 13886253be am: 8abe7c5544 am: 95cdf96320
am: 812bd82c63

Change-Id: If07286f03be817075bfb0f1bdd7fb4ff07e1d5df
2016-09-02 21:32:14 +00:00
Roshan Pius
812bd82c63 Merge "WifiEnterpriseConfig: Fix copy constructor" am: 13886253be am: 8abe7c5544
am: 95cdf96320

Change-Id: I0a09a2f0d1a2e49d928bf42e165a4586c501d4f0
2016-09-02 21:26:30 +00:00
Roshan Pius
9709b8b372 WifiEnterpriseConfig: Fix copy constructor
Add missing elements from WifiEnterpriseConfig copy
constructor.

BUG: 31245222
TEST: Ran ACTS WifiEnterpriseTest suite.
Change-Id: Ia6f95fca4131ad9a1facca8f9c4c856dff868058
2016-09-02 14:08:50 -07:00
Roshan Pius
8fcf291c08 Merge commit '3f3ed24' into stage-aosp-master am: e9b6029153 am: 756cbb248e
am: e500e63cc0

Change-Id: I2081c82b569d21b7fceb446ee82f67410ee17266
2016-09-02 07:38:55 +00:00
Roshan Pius
e500e63cc0 Merge commit '3f3ed24' into stage-aosp-master am: e9b6029153
am: 756cbb248e

Change-Id: I8d6ad1bcd2c41553ced95c9f59e8a35889d24edf
2016-09-02 07:32:34 +00:00
Roshan Pius
d2d667275d NetworkSelectionStatus: Fix copy constructor
Add one more missing element from NetworkSelectionStatus copy constructor.

BUG: 31102798
Change-Id: Iae18f944e7ef722b280b20a51f128f90b2ff45c7
2016-09-01 15:08:44 -07:00
Mitchell Wills
97e918a50d Revert "DO NOT MERGE Revert "Add WiFi toggle prompts - framework""
This reverts commit 8efb84e3e0b66696c45adb1faa0fe1e6f75f22c3.
2016-08-31 16:11:03 -07:00
Mitchell Wills
0d16a5f628 Merge commit 'accde60f09508f9543a094247ed95ce2ae605912' into nyc-mr1-dev-plus-aosp
am: fe11efd868

Change-Id: I233aae780b04a72e6f11790eb143e05eb541d66c
2016-08-31 22:31:54 +00:00
Paul Stewart
c4ec49b7b9 Document correct context for obtaining WifiManager am: 0e164b199e am: b09557b3cf
am: 163a135246

Change-Id: I943a2d60461633b9432bdf83c3b25086bba22b94
2016-08-30 17:20:02 +00:00
Mitchell Wills
fe11efd868 Merge commit 'accde60f09508f9543a094247ed95ce2ae605912' into nyc-mr1-dev-plus-aosp
Change-Id: I732a9b0bb6e569be342a6df3640f4e539f9ccce0
2016-08-29 20:38:08 -07:00
Mitchell Wills
e0d09999e9 DO NOT MERGE Revert "Add WiFi toggle prompts - framework"
This reverts commit 40f8b9251831c5f009fd476b1a3d216e126d3ef0.

Change-Id: I9a1d861277e5d32405da5815c8b4e5d616febf10
2016-08-29 20:21:42 -07:00
Mitchell Wills
8efb84e3e0 DO NOT MERGE Revert "Add WiFi toggle prompts - framework"
This reverts commit 40f8b9251831c5f009fd476b1a3d216e126d3ef0.

Change-Id: I23e8b6ac97d8853c271429fc13fbfa313717a95a
2016-08-29 20:15:48 -07:00
Mitchell Wills
722de5f9d0 DO NOT MERGE Manually merge commit 'f28778064383821ccf48c9570191f34a24aa513f' into nyc-mr1-dev-plus-aosp
Change-Id: I7cb1f97a5b931c2057a811d7947f47ad7320ef1c
2016-08-29 17:46:44 -07:00
Roshan Pius
521c66e73c NetworkSelectionStatus: Fix copy constructor
Add couple of missing elements in the NetworkSelectionStatus copy constructor.

BUG: 31102798
Change-Id: Ie5f3719b94acf021d4ae2756afd635388640168c
(cherry picked from commit 699680b6b4fb923e4129d678013e3fbbc0421eaa)
2016-08-29 11:26:57 -07:00
Randy Pan
22de5aaca9 Deprecate QNS network disable reason BAD_LINK
WifiNetworkAgent#unwanted no longer disables the network.

Bug: 28558417
Change-Id: I2e7ed99ae4cb952f124c673376d967eeee2b4ece
(cherry picked from commit 4156d615707a7aa27ecaf55c889824fd025a75b5)
2016-08-29 11:26:57 -07:00
Etan Cohen
b81c35f54b [NAN] API changes/fixes addressing apilint issues
Bug: 30983968
Change-Id: I2189442755380ad5d04f80bcb5978ca0c28e6420
(cherry picked from commit 9825309424cab3a3efabac0bde79b3c1419f9be9)
2016-08-29 11:26:56 -07:00
Etan Cohen
30a472e6b3 [NAN] Add method to ConfigRequest to determine if non-default
To be used in permission check.

Bug: 27696149
Change-Id: I5be5aed93c556cf24b596bd2a7c5672502f84d74
(cherry picked from commit 8266b3f876e6b96ac0f18216b2011b03a0504a23)
2016-08-29 11:26:56 -07:00
Etan Cohen
b6701faaf0 [NAN] Simplify publish/subscribe configuration - merge match filters
Merge Tx/Rx match filters into single Match filter configuration. Only
a single filter can be used at a time (either Tx or Rx).

Bug: 30948496
Change-Id: I32a9a0306dfd08295bc63145bccfe3739862f17d
(cherry picked from commit 6007681b19510d2a739ab45c1754d869f8f15e72)
2016-08-29 11:26:55 -07:00
Etan Cohen
b0214c4cd5 [NAN] Udpate NAN API documentation, clean-up visibility
Change-Id: I951340eebab35c10efe98dab86b58fe8efada169
(cherry picked from commit 2e37b06dde2dff019b9143fc6b61021dab79bda3)
2016-08-29 11:26:55 -07:00