Commit graph

1122 commits

Author SHA1 Message Date
Colin Cross
00df869e6a Merge "Convert libpower from Android.mk to Android.bp" am: b9344a5773 am: ad31b35bdc am: edefe8017b
am: 6e88e36531

Change-Id: Ib3836cfc05ff75e7aef370905a15fa023dc29b40
2017-01-14 04:50:53 +00:00
Colin Cross
6e88e36531 Merge "Convert libpower from Android.mk to Android.bp" am: b9344a5773 am: ad31b35bdc
am: edefe8017b

Change-Id: Ie8ad81dae319a9725da9885e160cd4fdfb62c8a8
2017-01-14 04:34:28 +00:00
Colin Cross
edefe8017b Merge "Convert libpower from Android.mk to Android.bp" am: b9344a5773
am: ad31b35bdc

Change-Id: I41eae92d0137552aa31ceb3d0ea9718b93f8b04e
2017-01-14 04:31:58 +00:00
Colin Cross
ad31b35bdc Merge "Convert libpower from Android.mk to Android.bp"
am: b9344a5773

Change-Id: Iccb9d303d50a34d701d95421b96b4bc95d5dae35
2017-01-14 04:28:57 +00:00
Treehugger Robot
b9344a5773 Merge "Convert libpower from Android.mk to Android.bp" 2017-01-14 04:24:52 +00:00
Colin Cross
d945d77458 Convert libpower from Android.mk to Android.bp
See build/soong/README.md for more information.

Test: builds
Change-Id: I4cc68e4bbe65abe741c02448aa7f42fdfd5804fa
2017-01-12 15:35:16 -08:00
Etan Cohen
e225e6f7f7 Merge changes from topic 'qc_api_drop' am: 6ffa14dd6c am: 4bcde74d50 am: 46397ba42e
am: b5def3a364

Change-Id: If40725244b1854c07111c1a90e157fc9ab38083a
2017-01-05 18:06:08 +00:00
Subhani Shaik
69e40656c9 [AWARE]: Error code fix in NdpIndiatorRequest am: 3cdbc44764 am: af412749f0 am: e041369d00
am: 8639303275

Change-Id: Ia33ffdf48ac3bd205a7c429803687e1b9c75315d
2017-01-05 18:05:26 +00:00
Subhani Shaik
4c8144e8fa [AWARE]: Config options to disable indications during Discovery am: 9c90771dee am: 4a1ece39eb am: 549d13f9a1
am: 367e66126d

Change-Id: I3815acd2de023787603436580b57deeba20541b2
2017-01-05 18:05:24 +00:00
Etan Cohen
b5def3a364 Merge changes from topic 'qc_api_drop' am: 6ffa14dd6c am: 4bcde74d50
am: 46397ba42e

Change-Id: Id2060065cc8e59e2232c1080f5b5526247d37222
2017-01-05 18:02:09 +00:00
Subhani Shaik
8639303275 [AWARE]: Error code fix in NdpIndiatorRequest am: 3cdbc44764 am: af412749f0
am: e041369d00

Change-Id: Ibefeb8b98f978b523735267da039a0f6b9f54de4
2017-01-05 18:01:26 +00:00
Subhani Shaik
367e66126d [AWARE]: Config options to disable indications during Discovery am: 9c90771dee am: 4a1ece39eb
am: 549d13f9a1

Change-Id: I10ac05642a10c63593ba648e749e05d22ce2bf9c
2017-01-05 18:01:24 +00:00
Etan Cohen
46397ba42e Merge changes from topic 'qc_api_drop' am: 6ffa14dd6c
am: 4bcde74d50

Change-Id: I4571b4c445deabf2ee2d2d702284cb90737e0f0a
2017-01-05 17:58:36 +00:00
Subhani Shaik
e041369d00 [AWARE]: Error code fix in NdpIndiatorRequest am: 3cdbc44764
am: af412749f0

Change-Id: I7492227b08db6caba97b817d412ab924cfbdc1aa
2017-01-05 17:57:55 +00:00
Subhani Shaik
549d13f9a1 [AWARE]: Config options to disable indications during Discovery am: 9c90771dee
am: 4a1ece39eb

Change-Id: I0f8f8a98d3ba92a446588fa35d48578e8ae7f590
2017-01-05 17:57:53 +00:00
Etan Cohen
4bcde74d50 Merge changes from topic 'qc_api_drop'
am: 6ffa14dd6c

Change-Id: I7e238a6e7e6c53241992771be39a1be85c333730
2017-01-05 17:55:17 +00:00
Subhani Shaik
af412749f0 [AWARE]: Error code fix in NdpIndiatorRequest
am: 3cdbc44764

Change-Id: I4ffe6974f38564588ddd0eb55180229d13341f6d
2017-01-05 17:54:24 +00:00
Subhani Shaik
4a1ece39eb [AWARE]: Config options to disable indications during Discovery
am: 9c90771dee

Change-Id: I8ff60d2eded1466918b8144d47972f4fd0a9181f
2017-01-05 17:54:22 +00:00
Etan Cohen
6ffa14dd6c Merge changes from topic 'qc_api_drop'
* changes:
  [AWARE]: Error code fix in NdpIndiatorRequest
  [AWARE]: Config options to disable indications during Discovery
2017-01-05 17:48:52 +00:00
Subhani Shaik
3cdbc44764 [AWARE]: Error code fix in NdpIndiatorRequest
Bug: 32207606
Test: integration (sl4a) tests passing - no regressions
Change-Id: I0d0e995b8506b3fe44cd0dc419a187739fa448de
2017-01-04 15:27:27 -08:00
Subhani Shaik
9c90771dee [AWARE]: Config options to disable indications during Discovery
Bug: 33250076
Test: integration (sl4a) tests passing - no regressions
Change-Id: I79b2ce07ed5798089e7762e6ba8e6f8a057928a6
2017-01-04 15:26:55 -08:00
Etan Cohen
e6e5cb4623 Merge "[AWARE]: Enable ranging in Publish/Subscribe/Indication" am: 6d26bb0360 am: c61d69fba8 am: f23cd51227
am: ed2d9617f5

Change-Id: I819370327c8be3474e011dbfcd6a2ee1c2011771
2016-12-22 18:45:03 +00:00
Etan Cohen
ed2d9617f5 Merge "[AWARE]: Enable ranging in Publish/Subscribe/Indication" am: 6d26bb0360 am: c61d69fba8
am: f23cd51227

Change-Id: Ia8b8cc8760485a250ba32d55dd6b1f17b0673c90
2016-12-22 18:27:56 +00:00
Etan Cohen
f23cd51227 Merge "[AWARE]: Enable ranging in Publish/Subscribe/Indication" am: 6d26bb0360
am: c61d69fba8

Change-Id: I1de5ccbd20d333a5c5f53930a61d4e607419b515
2016-12-22 18:23:27 +00:00
Etan Cohen
c61d69fba8 Merge "[AWARE]: Enable ranging in Publish/Subscribe/Indication"
am: 6d26bb0360

Change-Id: Idf973a47c0156190690dd763115097f8308107ed
2016-12-22 18:17:38 +00:00
Etan Cohen
6d26bb0360 Merge "[AWARE]: Enable ranging in Publish/Subscribe/Indication" 2016-12-22 18:01:01 +00:00
Subhani Shaik
ddf249539a [AWARE]: Enable ranging in Publish/Subscribe/Indication
Bug: 33821639
Test: unit + integration (sl4a) tests passing
Change-Id: I5aa9f39527a5296fa6a361a459b574521c774591
2016-12-21 22:41:53 -08:00
Randy Pan
f6835acb6e Merge "Roaming Enhancement API" am: ab920d2460 am: 9fc8d06e2f -s ours am: 45420947af -s ours
am: 1561cf04e3  -s ours

Change-Id: I0f19629e2745bcc356374f6394ae339a307e27c4
2016-12-13 19:51:31 +00:00
Randy Pan
1561cf04e3 Merge "Roaming Enhancement API" am: ab920d2460 am: 9fc8d06e2f -s ours
am: 45420947af  -s ours

Change-Id: Ib89b7dcacb39920d204a9eeb91a5e629ad63c79e
2016-12-13 19:44:59 +00:00
Randy Pan
45420947af Merge "Roaming Enhancement API" am: ab920d2460
am: 9fc8d06e2f  -s ours

Change-Id: I9b09c131addc442d037b7e6656af657252858496
2016-12-13 19:38:54 +00:00
Randy Pan
9fc8d06e2f Merge "Roaming Enhancement API"
am: ab920d2460

Change-Id: Ic45f3678794eee98570e9cb29d64e672d4a22669
2016-12-13 19:31:59 +00:00
Randy Pan
ab920d2460 Merge "Roaming Enhancement API" 2016-12-13 19:25:41 +00:00
Randy Pan
2c07e09d58 Merge "Roaming Enhancement API" into nyc-mr1-dev-plus-aosp am: bfb1de0e57 -s ours
am: 43f3346e8a  -s ours

Change-Id: I9232087828d3ff29dcec71126503f1fb9f14380b
2016-12-13 17:29:50 +00:00
Randy Pan
43f3346e8a Merge "Roaming Enhancement API" into nyc-mr1-dev-plus-aosp
am: bfb1de0e57  -s ours

Change-Id: I4219fc81a2fab8f61fa4f9a6591ab84e4aef6644
2016-12-13 17:27:56 +00:00
Subhani Shaik
4830706f8d Roaming Enhancement API am: 75814ce428
am: 26c1560d5d  -s ours

Change-Id: I93aa05518c1a6fcbdb8543cd6e0aee4b150cc103
2016-12-13 17:26:54 +00:00
Subhani Shaik
26c1560d5d Roaming Enhancement API
am: 75814ce428

Change-Id: I5ad4a09f94dcf2e6946af89ce09a75c2679fc560
2016-12-13 17:20:31 +00:00
Randy Pan
bfb1de0e57 Merge "Roaming Enhancement API" into nyc-mr1-dev-plus-aosp 2016-12-13 17:16:23 +00:00
Etan Cohen
5d35aef64a Merge changes from topic 'aware_hal_updates' am: 33b3f09576 am: 1d8b72d050 am: 02701653c0
am: 6be9c31c02

Change-Id: Id9d73e7a15516ae3d52066827977a0f8caf69c10
2016-12-13 15:27:22 +00:00
Subhani Shaik
08fbccdc3b [AWARE]: Enable Service Descriptor Extension Attribute am: 0001cdb414 am: 45559af039 am: 3a748b3221
am: 2e77e1e170

Change-Id: Ic200a2751f678a1f1abf51ccf73346627446fab3
2016-12-13 15:27:20 +00:00
Subhani Shaik
86062428fe [AWARE]: Enable Discovery MAC addr randomization am: f032356db0 am: 53fe3f6c9c am: 544b92baff
am: 14e005b63a

Change-Id: I61a2a42afea61efbc083a6ea8ad2ce6a08875669
2016-12-13 15:27:18 +00:00
Subhani Shaik
d758ca762b [AWARE]: Enable NAN Security am: 548fbb3ab5 am: 6968799354 am: 5a18f78015
am: 8c6dab11a0

Change-Id: I2a66aaddd67dc0cbc2b876121185f2d153f587ea
2016-12-13 15:27:16 +00:00
Subhani Shaik
a3859bd707 [AWARE] Config/Publish/Subscribe DW interval config am: 79e0e1be8c am: 8ee3b96dd1 am: 34433346df
am: 6cb2dfea1e

Change-Id: I9d07420ec866339a558870ca9b32850e9983d751
2016-12-13 15:27:14 +00:00
Subhani Shaik
e565efa022 [AWARE]: Include ndp operating channel in Sync stats am: 2383b51f66 am: ab84238365 am: 472872412e
am: a246448faa

Change-Id: Ia50395f75dfe93a9f871b414aff57fdf8b0fda37
2016-12-13 15:27:12 +00:00
Etan Cohen
6be9c31c02 Merge changes from topic 'aware_hal_updates' am: 33b3f09576 am: 1d8b72d050
am: 02701653c0

Change-Id: Ia8bdeac8ed4166c83317d0f255932483035ef4ee
2016-12-13 15:20:50 +00:00
Subhani Shaik
2e77e1e170 [AWARE]: Enable Service Descriptor Extension Attribute am: 0001cdb414 am: 45559af039
am: 3a748b3221

Change-Id: I72f53f347acfe9dd6225f78b586a66b00b4e0ca8
2016-12-13 15:20:48 +00:00
Subhani Shaik
14e005b63a [AWARE]: Enable Discovery MAC addr randomization am: f032356db0 am: 53fe3f6c9c
am: 544b92baff

Change-Id: I298267353af01e2f962951cdc5104f259ae1996c
2016-12-13 15:20:46 +00:00
Subhani Shaik
8c6dab11a0 [AWARE]: Enable NAN Security am: 548fbb3ab5 am: 6968799354
am: 5a18f78015

Change-Id: I6186abb54eb2d5cfe52af5c571b7dfc2f26216e6
2016-12-13 15:20:44 +00:00
Subhani Shaik
6cb2dfea1e [AWARE] Config/Publish/Subscribe DW interval config am: 79e0e1be8c am: 8ee3b96dd1
am: 34433346df

Change-Id: I5e3266114000fdf8aa938e0cfac8c76a6847487f
2016-12-13 15:20:42 +00:00
Subhani Shaik
a246448faa [AWARE]: Include ndp operating channel in Sync stats am: 2383b51f66 am: ab84238365
am: 472872412e

Change-Id: I6181ec7283967d708ddb2c1b048a95edf0b59ebb
2016-12-13 15:20:40 +00:00
Etan Cohen
02701653c0 Merge changes from topic 'aware_hal_updates' am: 33b3f09576
am: 1d8b72d050

Change-Id: Icaf27482b02f03505166036d3b058d566e1c3e4d
2016-12-13 15:13:49 +00:00