1618 Commits

Author SHA1 Message Date
Etan Cohen
234039affa [NAN] Update API javadoc to clarify NAN status change broadcast scope am: 4c22e8bede am: c3066c1d68
am: 4cb72b6125

Change-Id: I9decc48fd6486e5ef82c359c95d3b472ee5543d0
2016-09-30 21:13:09 +00:00
Etan Cohen
4c22e8bede [NAN] Update API javadoc to clarify NAN status change broadcast scope
(cherry-pick of commit 1fceaf9d63cd572cad57e71f6cb66f0cb59183b5)

Bug: 31675932
Test: make -j 32 update-api (to generate doc)
Change-Id: I7263a15902c423c1c71c2c457c82e8caef5abceb
2016-09-30 11:31:47 -07:00
Randy Pan
8f41a28f21 Merge "Remove the obsoleted ScanResult.isAutoJoinCandidate" am: 673b47f234 am: 63224d9ea3
am: 3629b4eddf

Change-Id: I2b148d84b278c92f2a1f0b12f9ca2ff231b4602c
2016-09-30 17:52:39 +00:00
Randy Pan
634d97add8 Remove the obsoleted ScanResult.isAutoJoinCandidate
Bug: 31565767
Test: unit tests
Change-Id: I3e1ee0e919c800c4d5eeaf94fdc68123b6de542e
2016-09-29 13:12:55 -07:00
Peter Qiu
588a2dc0c2 Merge "wifi: add test target/directory for unit testing WiFi framework APIs" am: afbe615993 am: 2b30cb4885
am: 887c9224af

Change-Id: I2ae1c51a40b61b74ce0f4f7dfe369f91378fa6ea
2016-09-28 23:16:22 +00:00
Treehugger Robot
afbe615993 Merge "wifi: add test target/directory for unit testing WiFi framework APIs" 2016-09-28 22:52:31 +00:00
Etan Cohen
cc9a933ea0 Merge "[NAN] Remove builder API using String to translate to byte[]" am: 1bca5ad210 am: 62bceaabe9
am: fd033a47e9

Change-Id: Ifab50666a6d71b3dfe18f06be5cb3137533998ee
2016-09-28 20:46:04 +00:00
Etan Cohen
60add8ad01 [NAN] Remove builder API using String to translate to byte[]
Per API review: String accessor was not needed (duplicate, semantics
not accurate, trivial use-case).

(cherry-pick of commit c76ccf3e7e673fb21f27ea8e7482021900b113cf)

Bug: 31470256
Test: unit tests & integration (sl4a) testing.
Change-Id: Id307702627afd8ee579b540d4c2f65359bf9a925
2016-09-28 11:47:24 -07:00
Etan Cohen
5d09ab4812 Merge "[NAN] Use a hidden class for peer ID opaque handle" am: e43c1a3e3e am: 66741c2c0f
am: a96c6e222b

Change-Id: I2bb9a0eb5040d0dd37ec2ffda5fa06bde9ee6a50
2016-09-28 05:25:52 +00:00
Etan Cohen
f085c1951a [NAN] Use a hidden class for peer ID opaque handle
Results in clearer run-time exception (relatively to using Integer).

(cherry-pick of commit 57db2b3eea5333e5ee144ea29e4a4af02fae7309)

Bug: 31689166
Test: unit-tests + integrated (sl4a).
Change-Id: I79d0e8061204834b9775b02d503cb18fd03ed8c6
2016-09-27 16:42:05 -07:00
Peter Qiu
601964b927 wifi: add test target/directory for unit testing WiFi framework APIs
The existing tests for the WiFi frameworks API android.net.wifi are
copied from frameworks/opt/wifi/tests, and will be removed in
frameworks/opt/wifi/tests.

Bug: 31745421
Change-Id: I789e983bc7dd02b6c3fa6a982ca671347912be0f
Test: frameworks/base/wifi/runtests.sh
2016-09-27 15:13:20 -07:00
Etan Cohen
fe985955c2 Merge "[NAN] Rename setTerminateNotificationEnabled per API review" am: 5d74bf9f95 am: 62be010f2a
am: fb43e8509b

Change-Id: Icba27b160eaf410d79605b49f6e3e566403c41e0
2016-09-27 20:12:33 +00:00
Etan Cohen
6c48c33735 [NAN] Rename setTerminateNotificationEnabled per API review
(cherry-pick of commit 7df9b7a1039ea8e34e82e650cebd1025a2591580)

Bug: 31470256
Test: unit tests + integrated (sl4a) tests
Change-Id: I1554b5b7961a5c46656a40ad395431125da7aa7f
2016-09-27 10:53:47 -07:00
Etan Cohen
996aa83d88 Merge "[NAN] Fix javadoc links" am: 4ad6291b08 am: 2cd4514323
am: c9b156f945

Change-Id: If0413d6fc68d072bb81f39ce10c15a1515e4debe
2016-09-26 23:43:50 +00:00
Etan Cohen
626446e464 Merge "[NAN] Fix incorrect log message" am: fe0f393116 am: e452d1e317
am: df82082e51

Change-Id: I05e21dca880f481c4795ff7609a1e0185a23fb9f
2016-09-26 21:07:34 +00:00
Etan Cohen
7c724e6708 [NAN] Fix javadoc links
(cherry-pick of commit ee3d9fc5e60ce4b57dbba7483ac323ed29df2e4a)

Bug: 31470256
Test: builds (javadoc only)
Change-Id: I645525660b9a6759f968d9e62cd79d6a851815bf
2016-09-26 13:54:50 -07:00
Etan Cohen
37db2fbfbd Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review" am: 88da460cd8 am: bc74135d6a
am: b319bc2bf7

Change-Id: Ib0d578323b719b90d3330993d61079dc3885bf52
2016-09-26 19:06:11 +00:00
Etan Cohen
41d6f375be [NAN] Fix incorrect log message
(cherry-pick of commit 0d7863406b1542c3092fa976cfb41b09a97dd8bd)

Bug: 31678708
Test: integrated (sl4a) test
Change-Id: I822c66619642f08d1d8f68cc8257185360da60be
2016-09-26 11:53:28 -07:00
Etan Cohen
27c18cbb5b [NAN] Replace int peerId with more opaqure Object peerHandle per API review
(cherry-pick of commit f02ae5e23cb59fcbd364907ecb1199424fc5eb62)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I0225027b8e1a2d7cb5d27afc91b97ef9643f5dff
2016-09-26 10:14:35 -07:00
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