1448 Commits

Author SHA1 Message Date
Etan Cohen
b041ae49d6 Merge "[NAN] Change Broadcast for NAN status change to notification only" am: e1513a8cc6 am: f95a3703c1
am: c83ae8d290

Change-Id: I1b8db56db307ce8d81a8df5833030d823724f42e
2016-09-26 16:58:27 +00:00
Etan Cohen
fe06766539 Merge "[NAN] Remove failure reason codes from API per API review" am: a7b2fff388 am: 3f1c33c7b8
am: 11b8fe0340

Change-Id: I505cc2614754afa9039126bd502a9e58f45184b3
2016-09-26 15:09:48 +00:00
Etan Cohen
93617997bb [NAN] Change Broadcast for NAN status change to notification only
Remove information about current status of NAN. Receiver will have
to query that information explicitly. New pattern (per API council
review) - helps reduce window for having old information.

(cherry-pick of commit 905077a590d5b63a262d6f1f4f6e555ad9b79359)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: If3d0873989389e6c69feb0d02e5d0c79cdf9679e
2016-09-26 07:53:57 -07:00
Etan Cohen
60aad2a2ba Merge "[NAN] Reorder parameters of send message method(s) per API review" am: 1dd012a41a am: a6c2aa4131
am: 10132fb994

Change-Id: I0be79dd5b8d21a94fd6a40fd08d054ed30003a8b
2016-09-26 13:15:38 +00:00
Etan Cohen
5542ccc59c [NAN] Remove failure reason codes from API per API review
Not all codes are actionable. Will add back if/as needed.

(cherry-pick of commit 4b47c3f5b869a5fb072b122c47bf2c9e87f582e9)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: Ibfc9df4dbd3b569caf4ade1da9d2ef43d99269a8
2016-09-26 06:05:06 -07:00
Etan Cohen
1dd012a41a Merge "[NAN] Reorder parameters of send message method(s) per API review" 2016-09-26 12:58:14 +00:00
Etan Cohen
7fa6ab7f9a Merge "[NAN] Add Handler to publish/subscribe per API review" am: 95abef9355 am: c8f03c33df
am: 3c94a1c56c

Change-Id: I3e8726f736066943164bb937f1f3aba6b415e1aa
2016-09-26 00:30:53 +00:00
Etan Cohen
8a66410296 [NAN] Reorder parameters of send message method(s) per API review
Move messageId before message in the argument list.

(cherry-pick of commit 3da7c88425d826e1a5e662f3d8671900e2ad15e5)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I6bfd673a0f92d9908c5b837b713120927b1a0123
2016-09-25 17:19:05 -07:00
Etan Cohen
ede1d0f211 [NAN] Add Handler to publish/subscribe per API review
All callback registrations must have handlers.

(cherry-pick of commit 9b04fd2475f5ebecb81e75a8272cf410ba3f5854)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I5ecc04f997e45b76710f526f378e4cf6e0e28fb9
2016-09-23 10:16:26 -07:00
Etan Cohen
4c83ebbc4d Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks." am: bc3d106b97 am: a29bcecad9
am: 0517a6dcc7

Change-Id: I2c19aade571d63aabcea5962a1e4956c164c99f6
2016-09-23 04:22:17 +00:00
Etan Cohen
bc3d106b97 Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks." 2016-09-23 03:59:40 +00:00
Christopher Wiley
531348c37a Remove WifiManager#get/setFrequencyBand am: 79ec1736be am: a7394a4a70
am: af51ffe814

Change-Id: Id522f1b468f7f83484db4b3a039648cf3ca19d9c
2016-09-23 00:04:50 +00:00
Christopher Wiley
a7394a4a70 Remove WifiManager#get/setFrequencyBand
am: 79ec1736be

Change-Id: I9b5b298fc3e47e77a59701e7f9d4dc18680f12b8
2016-09-22 23:50:58 +00:00
Christopher Wiley
430904a4ab Merge changes from topic 'remove-set-frequency-band'
* changes:
  Remove ability to set frequency from WifiAssociationTest
  Remove WifiManager#get/setFrequencyBand
2016-09-22 23:34:17 +00:00
Etan Cohen
d48845629b Merge "[NAN] Method renames based on API council feedback" am: dcac00f325 am: 3501748dea
am: 6b6c719dd2

Change-Id: I5ea3e18bbaec7875b3720febfd4bbdcb97c92883
2016-09-22 20:04:04 +00:00
Etan Cohen
78ef40a668 [NAN] Separate ATTACH from IDENTITY_CHANGE callbacks.
Provide separate mechanism to attach with a request for identity
change listener.

(cherry-pick of commit 78e33f277eff5183f4525ce2a699acf2ad848177)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I26b3bf4e904f3c3822578185fa55e2de5e63b71b
2016-09-21 18:11:33 -07:00
Etan Cohen
b68ed2876c [NAN] Method renames based on API council feedback
- Fix tenses throughout
- connect -> attach
- disconnect/terminate -> destroy
- IsUsable -> IsAvailable

Note: pure rename operation - no functional changes

(cherry-pick of commit 34a0342ab515762f3fc594ffbc4784e56e79ccbf)

Bug: 31470256
Test: unit tests + integration (sl4a) test
Change-Id: I0f275c590c63109b7196622cfc5001082e3eb5a2
2016-09-21 13:46:21 -07:00
Etan Cohen
307572149f Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect." am: 84b3d2040a am: 337baf9d42
am: ebe497e40b

Change-Id: I336641dfcfba46ad80936acbc73db869e0a0922a
2016-09-21 20:35:02 +00:00
Etan Cohen
bd4bf35d22 [NAN] Refactor WifiNanManager to create separate sessions per connect.
Separate session enables separate namespace for functions which depend
on a connection to exist.

(cherry-pick of commit a2eb21d1233e921487e3dada1d10ba3e14611168)

Bug: 31470256
Test: unit tests, integration (sl4a) tests.
Change-Id: I8be0bc609e55319446cef149ba49cd6f7a5f446a
2016-09-21 10:54:42 -07:00
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
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
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
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
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
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
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
d74f710e25 Merge "WifiConfiguration: Fix isEnterprise" am: 9221c96ae0 am: e597198f12
am: 478bb2b44d

Change-Id: I4981990a4dc3aa1dde70625b93798a2fd6ff8263
2016-09-06 23:21:41 +00: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
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
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
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