Commit graph

1323 commits

Author SHA1 Message Date
Etan Cohen
eaed213c02 Merge "[AWARE]: Add range report in SDEA params"
am: 1da29541bc

Change-Id: I1b882862aa737f804098e99eebd6bd58c48fe895
2017-03-09 23:18:30 +00:00
Etan Cohen
1da29541bc Merge "[AWARE]: Add range report in SDEA params" 2017-03-09 23:13:29 +00:00
Subhani Shaik
8747f478d1 [AWARE]: Add range report in SDEA params
Bug: 36065933
Test: integration (sl4a) tests.
Change-Id: Ice8e87e2a6e4ed4475c7e6dcc691103071e0a03b
2017-03-08 11:45:29 -08:00
Etan Cohen
b1ac19f380 Merge "Include get_iface_handle in header file" am: ea2adcc23a am: 9aaa236e05
am: 457553179e

Change-Id: I6a73e75f26c371578656e0efae338058f4ccd7cd
2017-03-08 18:02:34 +00:00
Etan Cohen
457553179e Merge "Include get_iface_handle in header file" am: ea2adcc23a
am: 9aaa236e05

Change-Id: I611245636817ecf2df8b57d26b2c3c6407fd3c35
2017-03-08 18:00:33 +00:00
Etan Cohen
9aaa236e05 Merge "Include get_iface_handle in header file"
am: ea2adcc23a

Change-Id: I8e03c907d0c77b83d0706de8d0326c286382b434
2017-03-08 17:58:03 +00:00
Etan Cohen
ea2adcc23a Merge "Include get_iface_handle in header file" 2017-03-08 17:53:07 +00:00
Subhani Shaik
cc38d64254 Include get_iface_handle in header file
Bug: 35868267
Change-Id: I8f826fc15272b39686aea957f6407200cd62fac6
2017-03-01 09:20:46 -08:00
Etan Cohen
e56f7ece7f Merge "[AWARE]: Fix documentation for Service responder policy" am: b82ef271aa am: 8f1dad1734
am: d87a902689

Change-Id: I2fc3eeb1c9b288730679872fb08d397062df16d8
2017-02-24 02:23:40 +00:00
Etan Cohen
d87a902689 Merge "[AWARE]: Fix documentation for Service responder policy" am: b82ef271aa
am: 8f1dad1734

Change-Id: I891b3cca3f384e8e7c78bccc26d798064ca641c4
2017-02-24 02:21:09 +00:00
Etan Cohen
8f1dad1734 Merge "[AWARE]: Fix documentation for Service responder policy"
am: b82ef271aa

Change-Id: I17b4b48391848b8a2580de339039b89d4257477f
2017-02-24 02:18:39 +00:00
Etan Cohen
b82ef271aa Merge "[AWARE]: Fix documentation for Service responder policy" 2017-02-24 02:15:28 +00:00
Subhani Shaik
a76eea523d [AWARE]: Fix documentation for Service responder policy
Bug: 35665140
Change-Id: I5fe10da87f76acd50e2704f14879eafc91363e2b
2017-02-23 16:30:11 -08:00
Etan Cohen
394bec52c0 Merge "[AWARE]: Enable SDEA based SSI" am: 83b034ea0f am: f9758f839e
am: 560bbbdff4

Change-Id: I1bf3c3a36f365a64b2a50c6e4c0c46e9d44353c4
2017-02-21 22:54:36 +00:00
Etan Cohen
560bbbdff4 Merge "[AWARE]: Enable SDEA based SSI" am: 83b034ea0f
am: f9758f839e

Change-Id: Iaf1b625203e8f8844a9a420417322b11709b5428
2017-02-21 22:52:05 +00:00
Etan Cohen
f9758f839e Merge "[AWARE]: Enable SDEA based SSI"
am: 83b034ea0f

Change-Id: I35f133f43353f5e690d064672c58012b5c61ad4f
2017-02-21 22:50:05 +00:00
Etan Cohen
83b034ea0f Merge "[AWARE]: Enable SDEA based SSI" 2017-02-21 22:47:26 +00:00
Subhani Shaik
a39fe6182c [AWARE]: Enable SDEA based SSI
Bug: 35193423
Test: integrated (sl4a) test
Change-Id: If29d93391071710bd419eeab6e384ca154da9c85
2017-02-21 12:20:04 -08:00
Etan Cohen
64dc2de0b3 Merge "[AWARE]: Configure ranging on discovery sessions" am: 427212dafe am: df1ea57d7c
am: 6c707e7bc4

Change-Id: I5dc373ffcf63c3e66a3bec2f3f544629788233f3
2017-02-21 18:00:59 +00:00
Etan Cohen
3a9a7169a8 Merge "[NAN] Security configuration (cipher)" am: 0f9dc48b2c am: f24303c6ec
am: 1aa8b4f330

Change-Id: Ic0335cc3e2c9833c83cd3d1497fa3f03a5502b52
2017-02-21 18:00:40 +00:00
Colin Cross
a1f2ef4d6f Merge "libhardware_legacy: remove dead code in Android.mk" am: 955b796f36 am: fa192e08eb
am: 20107d1fc9

Change-Id: I4344edee0d02c8df684147bde83ab67bf95c9a99
2017-02-21 18:00:32 +00:00
Etan Cohen
6c707e7bc4 Merge "[AWARE]: Configure ranging on discovery sessions" am: 427212dafe
am: df1ea57d7c

Change-Id: Ief748551e9e811f440731707d37bbd29e3071901
2017-02-21 17:59:22 +00:00
Etan Cohen
1aa8b4f330 Merge "[NAN] Security configuration (cipher)" am: 0f9dc48b2c
am: f24303c6ec

Change-Id: Ic0f00c2987b47915300596569b0fcffaf20dcb08
2017-02-21 17:59:03 +00:00
Colin Cross
20107d1fc9 Merge "libhardware_legacy: remove dead code in Android.mk" am: 955b796f36
am: fa192e08eb

Change-Id: If745fb128e54f2c0563a71d53809a5112a937edd
2017-02-21 17:58:56 +00:00
Etan Cohen
df1ea57d7c Merge "[AWARE]: Configure ranging on discovery sessions"
am: 427212dafe

Change-Id: Iaca2afa6aea253cf61cc1aa0fa267f5b52cb04cf
2017-02-21 17:57:04 +00:00
Etan Cohen
f24303c6ec Merge "[NAN] Security configuration (cipher)"
am: 0f9dc48b2c

Change-Id: Id7ad1e6adee225bbc885ca23a973a04512858016
2017-02-21 17:56:44 +00:00
Colin Cross
fa192e08eb Merge "libhardware_legacy: remove dead code in Android.mk"
am: 955b796f36

Change-Id: I621c976083a3ffb8128beb61f874bf3847382cbe
2017-02-21 17:56:36 +00:00
Etan Cohen
427212dafe Merge "[AWARE]: Configure ranging on discovery sessions" 2017-02-21 16:32:20 +00:00
Etan Cohen
0f9dc48b2c Merge "[NAN] Security configuration (cipher)" 2017-02-21 16:27:50 +00:00
Colin Cross
955b796f36 Merge "libhardware_legacy: remove dead code in Android.mk" 2017-02-21 02:43:06 +00:00
Subhani Shaik
f512262623 [AWARE]: Configure ranging on discovery sessions
Add ranging configuration on discovery session. Remove
from overall NAN configuration (enable/config).

Add controls/structures based on spec protocol.

Bug: 33821639
Test: integration (sl4a) tests pass
Change-Id: Ibd1065c401672ca1f6d3781e373178401d1e4a62
2017-02-17 13:03:18 -08:00
Etan Cohen
85dd512272 [NAN] Security configuration (cipher)
Add a constant to make the no-cipher specification explicit.

Bug: 35387576
Test: integrated (sl4a) tests pass.
Change-Id: Ia272cad70cd4bedbdbdb4d2c856167305f747a30
2017-02-17 11:31:25 -08:00
Etan Cohen
2f4508c1c9 Merge "[AWARE]: Document the default values in NAN enable/config" am: 1ea0399492 am: 7417f60856 am: 9ba1142190
am: c9a3c2b7e5

Change-Id: I213deacae4f5339b425833a65068fd3d802d0bcb
2017-02-16 21:19:56 +00:00
Etan Cohen
c9a3c2b7e5 Merge "[AWARE]: Document the default values in NAN enable/config" am: 1ea0399492 am: 7417f60856
am: 9ba1142190

Change-Id: I9447de8e5bb84579681397e8d79b55db1614ea76
2017-02-16 21:15:02 +00:00
Etan Cohen
9ba1142190 Merge "[AWARE]: Document the default values in NAN enable/config" am: 1ea0399492
am: 7417f60856

Change-Id: I5e6227b8f209199388ef8f5f0afebd7d62816786
2017-02-16 21:10:32 +00:00
Etan Cohen
7417f60856 Merge "[AWARE]: Document the default values in NAN enable/config"
am: 1ea0399492

Change-Id: I469dec8b95e75b083af9d5f5d5bce836f14ef8a6
2017-02-16 21:06:05 +00:00
Etan Cohen
1ea0399492 Merge "[AWARE]: Document the default values in NAN enable/config" 2017-02-16 21:00:11 +00:00
Etan Cohen
5ba74c71fc Merge "[AWARE]: Fix return code for transmitFollowUp method" am: f43910da9e am: f59832297f am: 59d92fd2b4
am: ac800456df

Change-Id: If944bd9d5bc17ec3ec80500d35ce7eaf5e0ea3d0
2017-02-16 20:36:12 +00:00
Etan Cohen
ac800456df Merge "[AWARE]: Fix return code for transmitFollowUp method" am: f43910da9e am: f59832297f
am: 59d92fd2b4

Change-Id: I275dd17d9624eb2f4f7089295175d2b92714c34f
2017-02-16 20:31:33 +00:00
Etan Cohen
59d92fd2b4 Merge "[AWARE]: Fix return code for transmitFollowUp method" am: f43910da9e
am: f59832297f

Change-Id: Ia7aa6f16b189334f993436353e10b2b384b089b4
2017-02-16 20:27:33 +00:00
Etan Cohen
f59832297f Merge "[AWARE]: Fix return code for transmitFollowUp method"
am: f43910da9e

Change-Id: I1df72f83ae9b02fedce5fc97d844e5e537883487
2017-02-16 20:23:06 +00:00
Etan Cohen
f43910da9e Merge "[AWARE]: Fix return code for transmitFollowUp method" 2017-02-16 20:16:45 +00:00
Subhani Shaik
eb72fbaf45 [AWARE]: Document the default values in NAN enable/config
Bug: 34059183
Change-Id: Ic651e93ef46d2f7ecf564f9a504db44d27401422
2017-02-16 19:16:47 +00:00
Subhani Shaik
0b0387e2ab [AWARE]: Fix return code for transmitFollowUp method 2017-02-15 22:20:20 -08:00
Bin Chen
33c7ebd729 libhardware_legacy: remove dead code in Android.mk
The commneted code is the only place in AOSP that still reference
BOARD_HAVE_BLUETOOTH and BOARD_USES_GENERIC_AUDIO. Delete it
to make things cleaner.

Test: Build
Change-Id: I37e3135bf2db2c6d46eb59d5a0de49d02c1a036d
Signed-off-by: Bin Chen <bin.chen@linaro.org>
2017-02-13 16:55:19 +11:00
Etan Cohen
5f947e630c Merge "[AWARE] Clean up deprecated error value field" am: 7fe581f49c am: c49a818c31 am: afcac92321
am: 8d2b9ea4b4

Change-Id: Ibaf3daab1c29332a8333373e5489518afbfaffad
2017-01-25 23:42:27 +00:00
Etan Cohen
8d2b9ea4b4 Merge "[AWARE] Clean up deprecated error value field" am: 7fe581f49c am: c49a818c31
am: afcac92321

Change-Id: I06fd82682f8f39bd0375629c97e83cc56f046b9b
2017-01-25 23:39:58 +00:00
Etan Cohen
afcac92321 Merge "[AWARE] Clean up deprecated error value field" am: 7fe581f49c
am: c49a818c31

Change-Id: Id9f19db7c5e3589e8f3682185b0895244decc6b7
2017-01-25 23:37:27 +00:00
Etan Cohen
c49a818c31 Merge "[AWARE] Clean up deprecated error value field"
am: 7fe581f49c

Change-Id: Iee12961e0ac27654104e7fe73ed80d87b620cc27
2017-01-25 23:34:29 +00:00
Etan Cohen
7fe581f49c Merge "[AWARE] Clean up deprecated error value field" 2017-01-25 23:30:38 +00:00