OSDN Git Service
Etan Cohen [Fri, 24 Feb 2017 02:23:40 +0000 (02:23 +0000)]
Merge "[AWARE]: Fix documentation for Service responder policy" am:
b82ef271aa am:
8f1dad1734
am:
d87a902689
Change-Id: I2fc3eeb1c9b288730679872fb08d397062df16d8
Etan Cohen [Fri, 24 Feb 2017 02:21:09 +0000 (02:21 +0000)]
Merge "[AWARE]: Fix documentation for Service responder policy" am:
b82ef271aa
am:
8f1dad1734
Change-Id: I891b3cca3f384e8e7c78bccc26d798064ca641c4
Etan Cohen [Fri, 24 Feb 2017 02:18:39 +0000 (02:18 +0000)]
Merge "[AWARE]: Fix documentation for Service responder policy"
am:
b82ef271aa
Change-Id: I17b4b48391848b8a2580de339039b89d4257477f
Etan Cohen [Fri, 24 Feb 2017 02:15:27 +0000 (02:15 +0000)]
Merge "[AWARE]: Fix documentation for Service responder policy"
Subhani Shaik [Fri, 24 Feb 2017 00:28:38 +0000 (16:28 -0800)]
[AWARE]: Fix documentation for Service responder policy
Bug:
35665140
Change-Id: I5fe10da87f76acd50e2704f14879eafc91363e2b
Etan Cohen [Tue, 21 Feb 2017 22:54:36 +0000 (22:54 +0000)]
Merge "[AWARE]: Enable SDEA based SSI" am:
83b034ea0f am:
f9758f839e
am:
560bbbdff4
Change-Id: I1bf3c3a36f365a64b2a50c6e4c0c46e9d44353c4
Etan Cohen [Tue, 21 Feb 2017 22:52:05 +0000 (22:52 +0000)]
Merge "[AWARE]: Enable SDEA based SSI" am:
83b034ea0f
am:
f9758f839e
Change-Id: Iaf1b625203e8f8844a9a420417322b11709b5428
Etan Cohen [Tue, 21 Feb 2017 22:50:05 +0000 (22:50 +0000)]
Merge "[AWARE]: Enable SDEA based SSI"
am:
83b034ea0f
Change-Id: I35f133f43353f5e690d064672c58012b5c61ad4f
Etan Cohen [Tue, 21 Feb 2017 22:47:25 +0000 (22:47 +0000)]
Merge "[AWARE]: Enable SDEA based SSI"
Subhani Shaik [Thu, 16 Feb 2017 06:42:23 +0000 (22:42 -0800)]
[AWARE]: Enable SDEA based SSI
Bug:
35193423
Test: integrated (sl4a) test
Change-Id: If29d93391071710bd419eeab6e384ca154da9c85
Etan Cohen [Tue, 21 Feb 2017 18:00:59 +0000 (18:00 +0000)]
Merge "[AWARE]: Configure ranging on discovery sessions" am:
427212dafe am:
df1ea57d7c
am:
6c707e7bc4
Change-Id: I5dc373ffcf63c3e66a3bec2f3f544629788233f3
Etan Cohen [Tue, 21 Feb 2017 18:00:40 +0000 (18:00 +0000)]
Merge "[NAN] Security configuration (cipher)" am:
0f9dc48b2c am:
f24303c6ec
am:
1aa8b4f330
Change-Id: Ic0335cc3e2c9833c83cd3d1497fa3f03a5502b52
Colin Cross [Tue, 21 Feb 2017 18:00:32 +0000 (18:00 +0000)]
Merge "libhardware_legacy: remove dead code in Android.mk" am:
955b796f36 am:
fa192e08eb
am:
20107d1fc9
Change-Id: I4344edee0d02c8df684147bde83ab67bf95c9a99
Etan Cohen [Tue, 21 Feb 2017 17:59:22 +0000 (17:59 +0000)]
Merge "[AWARE]: Configure ranging on discovery sessions" am:
427212dafe
am:
df1ea57d7c
Change-Id: Ief748551e9e811f440731707d37bbd29e3071901
Etan Cohen [Tue, 21 Feb 2017 17:59:03 +0000 (17:59 +0000)]
Merge "[NAN] Security configuration (cipher)" am:
0f9dc48b2c
am:
f24303c6ec
Change-Id: Ic0f00c2987b47915300596569b0fcffaf20dcb08
Colin Cross [Tue, 21 Feb 2017 17:58:56 +0000 (17:58 +0000)]
Merge "libhardware_legacy: remove dead code in Android.mk" am:
955b796f36
am:
fa192e08eb
Change-Id: If745fb128e54f2c0563a71d53809a5112a937edd
Etan Cohen [Tue, 21 Feb 2017 17:57:04 +0000 (17:57 +0000)]
Merge "[AWARE]: Configure ranging on discovery sessions"
am:
427212dafe
Change-Id: Iaca2afa6aea253cf61cc1aa0fa267f5b52cb04cf
Etan Cohen [Tue, 21 Feb 2017 17:56:44 +0000 (17:56 +0000)]
Merge "[NAN] Security configuration (cipher)"
am:
0f9dc48b2c
Change-Id: Id7ad1e6adee225bbc885ca23a973a04512858016
Colin Cross [Tue, 21 Feb 2017 17:56:36 +0000 (17:56 +0000)]
Merge "libhardware_legacy: remove dead code in Android.mk"
am:
955b796f36
Change-Id: I621c976083a3ffb8128beb61f874bf3847382cbe
Etan Cohen [Tue, 21 Feb 2017 16:32:19 +0000 (16:32 +0000)]
Merge "[AWARE]: Configure ranging on discovery sessions"
Etan Cohen [Tue, 21 Feb 2017 16:27:49 +0000 (16:27 +0000)]
Merge "[NAN] Security configuration (cipher)"
Colin Cross [Tue, 21 Feb 2017 02:43:06 +0000 (02:43 +0000)]
Merge "libhardware_legacy: remove dead code in Android.mk"
Subhani Shaik [Thu, 26 Jan 2017 18:24:11 +0000 (10:24 -0800)]
[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
Etan Cohen [Fri, 17 Feb 2017 19:31:25 +0000 (11:31 -0800)]
[NAN] Security configuration (cipher)
Add a constant to make the no-cipher specification explicit.
Bug:
35387576
Test: integrated (sl4a) tests pass.
Change-Id: Ia272cad70cd4bedbdbdb4d2c856167305f747a30
Etan Cohen [Thu, 16 Feb 2017 21:19:56 +0000 (21:19 +0000)]
Merge "[AWARE]: Document the default values in NAN enable/config" am:
1ea0399492 am:
7417f60856 am:
9ba1142190
am:
c9a3c2b7e5
Change-Id: I213deacae4f5339b425833a65068fd3d802d0bcb
Etan Cohen [Thu, 16 Feb 2017 21:15:02 +0000 (21:15 +0000)]
Merge "[AWARE]: Document the default values in NAN enable/config" am:
1ea0399492 am:
7417f60856
am:
9ba1142190
Change-Id: I9447de8e5bb84579681397e8d79b55db1614ea76
Etan Cohen [Thu, 16 Feb 2017 21:10:32 +0000 (21:10 +0000)]
Merge "[AWARE]: Document the default values in NAN enable/config" am:
1ea0399492
am:
7417f60856
Change-Id: I5e6227b8f209199388ef8f5f0afebd7d62816786
Etan Cohen [Thu, 16 Feb 2017 21:06:05 +0000 (21:06 +0000)]
Merge "[AWARE]: Document the default values in NAN enable/config"
am:
1ea0399492
Change-Id: I469dec8b95e75b083af9d5f5d5bce836f14ef8a6
Etan Cohen [Thu, 16 Feb 2017 21:00:10 +0000 (21:00 +0000)]
Merge "[AWARE]: Document the default values in NAN enable/config"
Etan Cohen [Thu, 16 Feb 2017 20:36:12 +0000 (20:36 +0000)]
Merge "[AWARE]: Fix return code for transmitFollowUp method" am:
f43910da9e am:
f59832297f am:
59d92fd2b4
am:
ac800456df
Change-Id: If944bd9d5bc17ec3ec80500d35ce7eaf5e0ea3d0
Etan Cohen [Thu, 16 Feb 2017 20:31:33 +0000 (20:31 +0000)]
Merge "[AWARE]: Fix return code for transmitFollowUp method" am:
f43910da9e am:
f59832297f
am:
59d92fd2b4
Change-Id: I275dd17d9624eb2f4f7089295175d2b92714c34f
Etan Cohen [Thu, 16 Feb 2017 20:27:33 +0000 (20:27 +0000)]
Merge "[AWARE]: Fix return code for transmitFollowUp method" am:
f43910da9e
am:
f59832297f
Change-Id: Ia7aa6f16b189334f993436353e10b2b384b089b4
Etan Cohen [Thu, 16 Feb 2017 20:23:06 +0000 (20:23 +0000)]
Merge "[AWARE]: Fix return code for transmitFollowUp method"
am:
f43910da9e
Change-Id: I1df72f83ae9b02fedce5fc97d844e5e537883487
Etan Cohen [Thu, 16 Feb 2017 20:16:45 +0000 (20:16 +0000)]
Merge "[AWARE]: Fix return code for transmitFollowUp method"
Subhani Shaik [Wed, 11 Jan 2017 23:08:00 +0000 (15:08 -0800)]
[AWARE]: Document the default values in NAN enable/config
Bug:
34059183
Change-Id: Ic651e93ef46d2f7ecf564f9a504db44d27401422
Subhani Shaik [Thu, 16 Feb 2017 06:20:20 +0000 (22:20 -0800)]
[AWARE]: Fix return code for transmitFollowUp method
Bin Chen [Mon, 13 Feb 2017 05:47:42 +0000 (16:47 +1100)]
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>
Etan Cohen [Wed, 25 Jan 2017 23:42:27 +0000 (23:42 +0000)]
Merge "[AWARE] Clean up deprecated error value field" am:
7fe581f49c am:
c49a818c31 am:
afcac92321
am:
8d2b9ea4b4
Change-Id: Ibaf3daab1c29332a8333373e5489518afbfaffad
Etan Cohen [Wed, 25 Jan 2017 23:39:58 +0000 (23:39 +0000)]
Merge "[AWARE] Clean up deprecated error value field" am:
7fe581f49c am:
c49a818c31
am:
afcac92321
Change-Id: I06fd82682f8f39bd0375629c97e83cc56f046b9b
Etan Cohen [Wed, 25 Jan 2017 23:37:27 +0000 (23:37 +0000)]
Merge "[AWARE] Clean up deprecated error value field" am:
7fe581f49c
am:
c49a818c31
Change-Id: Id9f19db7c5e3589e8f3682185b0895244decc6b7
Etan Cohen [Wed, 25 Jan 2017 23:34:29 +0000 (23:34 +0000)]
Merge "[AWARE] Clean up deprecated error value field"
am:
7fe581f49c
Change-Id: Iee12961e0ac27654104e7fe73ed80d87b620cc27
Etan Cohen [Wed, 25 Jan 2017 23:30:37 +0000 (23:30 +0000)]
Merge "[AWARE] Clean up deprecated error value field"
Etan Cohen [Tue, 29 Nov 2016 22:38:51 +0000 (14:38 -0800)]
[AWARE] Clean up deprecated error value field
Left deprecated field in place since it broke
dependent projects. Dependencies cleaned-up -
remove field.
Bug:
27914592
Test: build only requirements since unused field
Change-Id: I910ffd811ddbca9b83a0190eaede2a58b36fedc8
Colin Cross [Sat, 14 Jan 2017 04:50:53 +0000 (04:50 +0000)]
Merge "Convert libpower from Android.mk to Android.bp" am:
b9344a5773 am:
ad31b35bdc am:
edefe8017b
am:
6e88e36531
Change-Id: Ib3836cfc05ff75e7aef370905a15fa023dc29b40
Colin Cross [Sat, 14 Jan 2017 04:34:28 +0000 (04:34 +0000)]
Merge "Convert libpower from Android.mk to Android.bp" am:
b9344a5773 am:
ad31b35bdc
am:
edefe8017b
Change-Id: Ie8ad81dae319a9725da9885e160cd4fdfb62c8a8
Colin Cross [Sat, 14 Jan 2017 04:31:58 +0000 (04:31 +0000)]
Merge "Convert libpower from Android.mk to Android.bp" am:
b9344a5773
am:
ad31b35bdc
Change-Id: I41eae92d0137552aa31ceb3d0ea9718b93f8b04e
Colin Cross [Sat, 14 Jan 2017 04:28:57 +0000 (04:28 +0000)]
Merge "Convert libpower from Android.mk to Android.bp"
am:
b9344a5773
Change-Id: Iccb9d303d50a34d701d95421b96b4bc95d5dae35
Treehugger Robot [Sat, 14 Jan 2017 04:24:51 +0000 (04:24 +0000)]
Merge "Convert libpower from Android.mk to Android.bp"
Colin Cross [Tue, 8 Nov 2016 18:17:11 +0000 (10:17 -0800)]
Convert libpower from Android.mk to Android.bp
See build/soong/README.md for more information.
Test: builds
Change-Id: I4cc68e4bbe65abe741c02448aa7f42fdfd5804fa
Etan Cohen [Thu, 5 Jan 2017 18:06:08 +0000 (18:06 +0000)]
Merge changes from topic 'qc_api_drop' am:
6ffa14dd6c am:
4bcde74d50 am:
46397ba42e
am:
b5def3a364
Change-Id: If40725244b1854c07111c1a90e157fc9ab38083a
Subhani Shaik [Thu, 5 Jan 2017 18:05:26 +0000 (18:05 +0000)]
[AWARE]: Error code fix in NdpIndiatorRequest am:
3cdbc44764 am:
af412749f0 am:
e041369d00
am:
8639303275
Change-Id: Ia33ffdf48ac3bd205a7c429803687e1b9c75315d
Subhani Shaik [Thu, 5 Jan 2017 18:05:24 +0000 (18:05 +0000)]
[AWARE]: Config options to disable indications during Discovery am:
9c90771dee am:
4a1ece39eb am:
549d13f9a1
am:
367e66126d
Change-Id: I3815acd2de023787603436580b57deeba20541b2
Etan Cohen [Thu, 5 Jan 2017 18:02:09 +0000 (18:02 +0000)]
Merge changes from topic 'qc_api_drop' am:
6ffa14dd6c am:
4bcde74d50
am:
46397ba42e
Change-Id: Id2060065cc8e59e2232c1080f5b5526247d37222
Subhani Shaik [Thu, 5 Jan 2017 18:01:26 +0000 (18:01 +0000)]
[AWARE]: Error code fix in NdpIndiatorRequest am:
3cdbc44764 am:
af412749f0
am:
e041369d00
Change-Id: Ibefeb8b98f978b523735267da039a0f6b9f54de4
Subhani Shaik [Thu, 5 Jan 2017 18:01:24 +0000 (18:01 +0000)]
[AWARE]: Config options to disable indications during Discovery am:
9c90771dee am:
4a1ece39eb
am:
549d13f9a1
Change-Id: I10ac05642a10c63593ba648e749e05d22ce2bf9c
Etan Cohen [Thu, 5 Jan 2017 17:58:36 +0000 (17:58 +0000)]
Merge changes from topic 'qc_api_drop' am:
6ffa14dd6c
am:
4bcde74d50
Change-Id: I4571b4c445deabf2ee2d2d702284cb90737e0f0a
Subhani Shaik [Thu, 5 Jan 2017 17:57:55 +0000 (17:57 +0000)]
[AWARE]: Error code fix in NdpIndiatorRequest am:
3cdbc44764
am:
af412749f0
Change-Id: I7492227b08db6caba97b817d412ab924cfbdc1aa
Subhani Shaik [Thu, 5 Jan 2017 17:57:53 +0000 (17:57 +0000)]
[AWARE]: Config options to disable indications during Discovery am:
9c90771dee
am:
4a1ece39eb
Change-Id: I0f8f8a98d3ba92a446588fa35d48578e8ae7f590
Etan Cohen [Thu, 5 Jan 2017 17:55:17 +0000 (17:55 +0000)]
Merge changes from topic 'qc_api_drop'
am:
6ffa14dd6c
Change-Id: I7e238a6e7e6c53241992771be39a1be85c333730
Subhani Shaik [Thu, 5 Jan 2017 17:54:24 +0000 (17:54 +0000)]
[AWARE]: Error code fix in NdpIndiatorRequest
am:
3cdbc44764
Change-Id: I4ffe6974f38564588ddd0eb55180229d13341f6d
Subhani Shaik [Thu, 5 Jan 2017 17:54:22 +0000 (17:54 +0000)]
[AWARE]: Config options to disable indications during Discovery
am:
9c90771dee
Change-Id: I8ff60d2eded1466918b8144d47972f4fd0a9181f
Etan Cohen [Thu, 5 Jan 2017 17:48:52 +0000 (17:48 +0000)]
Merge changes from topic 'qc_api_drop'
* changes:
[AWARE]: Error code fix in NdpIndiatorRequest
[AWARE]: Config options to disable indications during Discovery
Subhani Shaik [Wed, 4 Jan 2017 18:51:03 +0000 (10:51 -0800)]
[AWARE]: Error code fix in NdpIndiatorRequest
Bug:
32207606
Test: integration (sl4a) tests passing - no regressions
Change-Id: I0d0e995b8506b3fe44cd0dc419a187739fa448de
Subhani Shaik [Wed, 28 Dec 2016 00:53:44 +0000 (16:53 -0800)]
[AWARE]: Config options to disable indications during Discovery
Bug:
33250076
Test: integration (sl4a) tests passing - no regressions
Change-Id: I79b2ce07ed5798089e7762e6ba8e6f8a057928a6
Etan Cohen [Thu, 22 Dec 2016 18:45:03 +0000 (18:45 +0000)]
Merge "[AWARE]: Enable ranging in Publish/Subscribe/Indication" am:
6d26bb0360 am:
c61d69fba8 am:
f23cd51227
am:
ed2d9617f5
Change-Id: I819370327c8be3474e011dbfcd6a2ee1c2011771
Etan Cohen [Thu, 22 Dec 2016 18:27:56 +0000 (18:27 +0000)]
Merge "[AWARE]: Enable ranging in Publish/Subscribe/Indication" am:
6d26bb0360 am:
c61d69fba8
am:
f23cd51227
Change-Id: Ia8b8cc8760485a250ba32d55dd6b1f17b0673c90
Etan Cohen [Thu, 22 Dec 2016 18:23:27 +0000 (18:23 +0000)]
Merge "[AWARE]: Enable ranging in Publish/Subscribe/Indication" am:
6d26bb0360
am:
c61d69fba8
Change-Id: I1de5ccbd20d333a5c5f53930a61d4e607419b515
Etan Cohen [Thu, 22 Dec 2016 18:17:38 +0000 (18:17 +0000)]
Merge "[AWARE]: Enable ranging in Publish/Subscribe/Indication"
am:
6d26bb0360
Change-Id: Idf973a47c0156190690dd763115097f8308107ed
Etan Cohen [Thu, 22 Dec 2016 18:01:00 +0000 (18:01 +0000)]
Merge "[AWARE]: Enable ranging in Publish/Subscribe/Indication"
Subhani Shaik [Wed, 7 Dec 2016 23:21:22 +0000 (15:21 -0800)]
[AWARE]: Enable ranging in Publish/Subscribe/Indication
Bug:
33821639
Test: unit + integration (sl4a) tests passing
Change-Id: I5aa9f39527a5296fa6a361a459b574521c774591
Randy Pan [Tue, 13 Dec 2016 19:51:31 +0000 (19:51 +0000)]
Merge "Roaming Enhancement API" am:
ab920d2460 am:
9fc8d06e2f -s ours am:
45420947af -s ours
am:
1561cf04e3 -s ours
Change-Id: I0f19629e2745bcc356374f6394ae339a307e27c4
Randy Pan [Tue, 13 Dec 2016 19:44:59 +0000 (19:44 +0000)]
Merge "Roaming Enhancement API" am:
ab920d2460 am:
9fc8d06e2f -s ours
am:
45420947af -s ours
Change-Id: Ib89b7dcacb39920d204a9eeb91a5e629ad63c79e
Randy Pan [Tue, 13 Dec 2016 19:38:54 +0000 (19:38 +0000)]
Merge "Roaming Enhancement API" am:
ab920d2460
am:
9fc8d06e2f -s ours
Change-Id: I9b09c131addc442d037b7e6656af657252858496
Randy Pan [Tue, 13 Dec 2016 19:31:59 +0000 (19:31 +0000)]
Merge "Roaming Enhancement API"
am:
ab920d2460
Change-Id: Ic45f3678794eee98570e9cb29d64e672d4a22669
Randy Pan [Tue, 13 Dec 2016 19:25:40 +0000 (19:25 +0000)]
Merge "Roaming Enhancement API"
Randy Pan [Tue, 13 Dec 2016 17:29:50 +0000 (17:29 +0000)]
Merge "Roaming Enhancement API" into nyc-mr1-dev-plus-aosp am:
bfb1de0e57 -s ours
am:
43f3346e8a -s ours
Change-Id: I9232087828d3ff29dcec71126503f1fb9f14380b
Randy Pan [Tue, 13 Dec 2016 17:27:56 +0000 (17:27 +0000)]
Merge "Roaming Enhancement API" into nyc-mr1-dev-plus-aosp
am:
bfb1de0e57 -s ours
Change-Id: I4219fc81a2fab8f61fa4f9a6591ab84e4aef6644
Subhani Shaik [Tue, 13 Dec 2016 17:26:54 +0000 (17:26 +0000)]
Roaming Enhancement API am:
75814ce428
am:
26c1560d5d -s ours
Change-Id: I93aa05518c1a6fcbdb8543cd6e0aee4b150cc103
Subhani Shaik [Tue, 13 Dec 2016 17:20:31 +0000 (17:20 +0000)]
Roaming Enhancement API
am:
75814ce428
Change-Id: I5ad4a09f94dcf2e6946af89ce09a75c2679fc560
Randy Pan [Tue, 13 Dec 2016 17:16:21 +0000 (17:16 +0000)]
Merge "Roaming Enhancement API" into nyc-mr1-dev-plus-aosp
Etan Cohen [Tue, 13 Dec 2016 15:27:22 +0000 (15:27 +0000)]
Merge changes from topic 'aware_hal_updates' am:
33b3f09576 am:
1d8b72d050 am:
02701653c0
am:
6be9c31c02
Change-Id: Id9d73e7a15516ae3d52066827977a0f8caf69c10
Subhani Shaik [Tue, 13 Dec 2016 15:27:20 +0000 (15:27 +0000)]
[AWARE]: Enable Service Descriptor Extension Attribute am:
0001cdb414 am:
45559af039 am:
3a748b3221
am:
2e77e1e170
Change-Id: Ic200a2751f678a1f1abf51ccf73346627446fab3
Subhani Shaik [Tue, 13 Dec 2016 15:27:18 +0000 (15:27 +0000)]
[AWARE]: Enable Discovery MAC addr randomization am:
f032356db0 am:
53fe3f6c9c am:
544b92baff
am:
14e005b63a
Change-Id: I61a2a42afea61efbc083a6ea8ad2ce6a08875669
Subhani Shaik [Tue, 13 Dec 2016 15:27:16 +0000 (15:27 +0000)]
[AWARE]: Enable NAN Security am:
548fbb3ab5 am:
6968799354 am:
5a18f78015
am:
8c6dab11a0
Change-Id: I2a66aaddd67dc0cbc2b876121185f2d153f587ea
Subhani Shaik [Tue, 13 Dec 2016 15:27:14 +0000 (15:27 +0000)]
[AWARE] Config/Publish/Subscribe DW interval config am:
79e0e1be8c am:
8ee3b96dd1 am:
34433346df
am:
6cb2dfea1e
Change-Id: I9d07420ec866339a558870ca9b32850e9983d751
Subhani Shaik [Tue, 13 Dec 2016 15:27:12 +0000 (15:27 +0000)]
[AWARE]: Include ndp operating channel in Sync stats am:
2383b51f66 am:
ab84238365 am:
472872412e
am:
a246448faa
Change-Id: Ia50395f75dfe93a9f871b414aff57fdf8b0fda37
Etan Cohen [Tue, 13 Dec 2016 15:20:50 +0000 (15:20 +0000)]
Merge changes from topic 'aware_hal_updates' am:
33b3f09576 am:
1d8b72d050
am:
02701653c0
Change-Id: Ia8bdeac8ed4166c83317d0f255932483035ef4ee
Subhani Shaik [Tue, 13 Dec 2016 15:20:48 +0000 (15:20 +0000)]
[AWARE]: Enable Service Descriptor Extension Attribute am:
0001cdb414 am:
45559af039
am:
3a748b3221
Change-Id: I72f53f347acfe9dd6225f78b586a66b00b4e0ca8
Subhani Shaik [Tue, 13 Dec 2016 15:20:46 +0000 (15:20 +0000)]
[AWARE]: Enable Discovery MAC addr randomization am:
f032356db0 am:
53fe3f6c9c
am:
544b92baff
Change-Id: I298267353af01e2f962951cdc5104f259ae1996c
Subhani Shaik [Tue, 13 Dec 2016 15:20:44 +0000 (15:20 +0000)]
[AWARE]: Enable NAN Security am:
548fbb3ab5 am:
6968799354
am:
5a18f78015
Change-Id: I6186abb54eb2d5cfe52af5c571b7dfc2f26216e6
Subhani Shaik [Tue, 13 Dec 2016 15:20:42 +0000 (15:20 +0000)]
[AWARE] Config/Publish/Subscribe DW interval config am:
79e0e1be8c am:
8ee3b96dd1
am:
34433346df
Change-Id: I5e3266114000fdf8aa938e0cfac8c76a6847487f
Subhani Shaik [Tue, 13 Dec 2016 15:20:40 +0000 (15:20 +0000)]
[AWARE]: Include ndp operating channel in Sync stats am:
2383b51f66 am:
ab84238365
am:
472872412e
Change-Id: I6181ec7283967d708ddb2c1b048a95edf0b59ebb
Etan Cohen [Tue, 13 Dec 2016 15:13:49 +0000 (15:13 +0000)]
Merge changes from topic 'aware_hal_updates' am:
33b3f09576
am:
1d8b72d050
Change-Id: Icaf27482b02f03505166036d3b058d566e1c3e4d
Subhani Shaik [Tue, 13 Dec 2016 15:13:47 +0000 (15:13 +0000)]
[AWARE]: Enable Service Descriptor Extension Attribute am:
0001cdb414
am:
45559af039
Change-Id: I1c270e165424a94e07125a895c7d09b9f57a7cb0
Subhani Shaik [Tue, 13 Dec 2016 15:13:46 +0000 (15:13 +0000)]
[AWARE]: Enable Discovery MAC addr randomization am:
f032356db0
am:
53fe3f6c9c
Change-Id: Ie8acccea12b10efc481048e67885d2b953b0f5ef
Subhani Shaik [Tue, 13 Dec 2016 15:13:44 +0000 (15:13 +0000)]
[AWARE]: Enable NAN Security am:
548fbb3ab5
am:
6968799354
Change-Id: I6606803b630079150da0812e5c1f813a97e3f51f
Subhani Shaik [Tue, 13 Dec 2016 15:13:42 +0000 (15:13 +0000)]
[AWARE] Config/Publish/Subscribe DW interval config am:
79e0e1be8c
am:
8ee3b96dd1
Change-Id: I08e89131a7cdbcabd3f76d09f7b179a42fd540c3
Subhani Shaik [Tue, 13 Dec 2016 15:13:40 +0000 (15:13 +0000)]
[AWARE]: Include ndp operating channel in Sync stats am:
2383b51f66
am:
ab84238365
Change-Id: Icebb18eb1e7b0b3b9b2b7a68907600530bca678d
Etan Cohen [Tue, 13 Dec 2016 15:06:55 +0000 (15:06 +0000)]
Merge changes from topic 'aware_hal_updates'
am:
33b3f09576
Change-Id: If263cb4f845c3aa1e64a9a07336e081315a28af4
Subhani Shaik [Tue, 13 Dec 2016 15:06:47 +0000 (15:06 +0000)]
[AWARE]: Enable Service Descriptor Extension Attribute
am:
0001cdb414
Change-Id: I2bd71eb03eb204805f4be4f5a225b1a7a74804c0