OSDN Git Service
Ugo Yu [Wed, 5 Jun 2019 02:33:21 +0000 (19:33 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
9d5a28a536 -s ours am:
4a0d26a8f3 -s ours
am:
2bd5b33135
Change-Id: I70352ac6644193e012ae5be8a3424c8162a9ec4a
Ugo Yu [Wed, 5 Jun 2019 02:32:34 +0000 (19:32 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev am:
e488319d82 -s ours
am:
c7ee86a352
Change-Id: I8fe19b571402d607c0c5be6a5542f322f15f3ed3
Jakub Pawlowski [Wed, 5 Jun 2019 02:24:17 +0000 (19:24 -0700)]
Hearing Aid: properly track audio Suspend/Resume am:
054762bcfe
am:
463943aa34
Change-Id: Ia8e18dee8429530605836673a28c5fd1e23c95bd
Ugo Yu [Wed, 5 Jun 2019 01:12:19 +0000 (18:12 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
9d5a28a536 -s ours
am:
4a0d26a8f3 -s ours
am skip reason: subject contains skip directive
Change-Id: I91b43f29574e5f14706de654f2449a765adbb119
Ugo Yu [Wed, 5 Jun 2019 01:11:31 +0000 (18:11 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev
am:
e488319d82 -s ours
am skip reason: subject contains skip directive
Change-Id: I41fb2cdaaab4b9ddab2aa5465a33e02523676df8
Jakub Pawlowski [Wed, 5 Jun 2019 01:02:17 +0000 (18:02 -0700)]
Hearing Aid: properly track audio Suspend/Resume
am:
054762bcfe
Change-Id: I3aa6513dab1773d521933bc69fb1eb731d6835f1
Jakub Pawlowski [Tue, 4 Jun 2019 21:23:16 +0000 (23:23 +0200)]
Hearing Aid: properly track audio Suspend/Resume
When audio is suspended or resumed, we are notified by OnAudioSuspend or
OnAudioResume callback. Unfortunately, when we are the one triggering
the HearingAidAudioSource::Stop(), we would not receive the suspend
callback. This is causing HA to believe audio is being streamed when
it's not.
This patch fixes that by setting audio_running to false when we make
call to Stop()
Bug:
132793574
Test: Play audio, restart Hearing Aid, verify START command is not being
sent
Change-Id: I3c4551114ac275ea8c72f64a8d036373429acd6d
Ugo Yu [Tue, 4 Jun 2019 19:44:40 +0000 (12:44 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2)
am:
9d5a28a536 -s ours
am skip reason: subject contains skip directive
Change-Id: I09c517978113a8837c1cbccab61fa75eb7f199fd
TreeHugger Robot [Tue, 4 Jun 2019 17:09:40 +0000 (17:09 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev
Myles Watson [Mon, 3 Jun 2019 22:03:15 +0000 (15:03 -0700)]
OS: Add death tests for en/de-queue registration am:
b06e0b59cb
am:
33efc477d7
Change-Id: Ib47f9c881e3c295bdbae7b34310a32a7b58ee842
Myles Watson [Mon, 3 Jun 2019 21:55:31 +0000 (14:55 -0700)]
OS: Add death tests for en/de-queue registration
am:
b06e0b59cb
Change-Id: Ifcbaec5cd56ec89e1a4a965e8b53b38a085f51bf
Myles Watson [Mon, 3 Jun 2019 21:42:16 +0000 (14:42 -0700)]
Revert "OS: Construct Handler using Reactor" am:
dde08cdba3
am:
6a5abebe4a
Change-Id: Ia7dd29b27419a3f7e61dc38e6fcbb4a11425df0f
Myles Watson [Mon, 3 Jun 2019 21:34:58 +0000 (14:34 -0700)]
Revert "OS: Construct Handler using Reactor"
am:
dde08cdba3
Change-Id: I866c437c67e72b0b8f0372f3aa02a1f463f143c8
Myles Watson [Mon, 3 Jun 2019 16:13:21 +0000 (09:13 -0700)]
OS: Add death tests for en/de-queue registration
Test: bluetooth_gd_test
Change-Id: Iadf126018a2c919fa10096506009674e7a2cd73c
Myles Watson [Mon, 3 Jun 2019 16:06:26 +0000 (09:06 -0700)]
Revert "OS: Construct Handler using Reactor"
Reactors are an implementation-specific detail.
This reverts commit
0a2f52e692bb65cea7ecff7ce1b1e839b786d5c7.
Test: bluetooth_gd_test
Change-Id: If74a9e0f32671ba96a723e51eee495f2aebf1e7c
Martin Brabham [Mon, 3 Jun 2019 15:51:53 +0000 (08:51 -0700)]
[automerger skipped] Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into oc-dev am:
4823241553 am:
9cf0c2c6d2 am:
6f51f61aab -s ours am:
e46949a6e4 -s ours
am:
14a23759f6
Change-Id: I6b0f08cdcf827de4fc681ba4949469c428f3e1c9
Martin Brabham [Mon, 3 Jun 2019 15:51:33 +0000 (08:51 -0700)]
[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
ee34c562b2 am:
4fcab76aec am:
e89aa63902 -s ours am:
4bf75ac4ad -s ours
am:
2da31340ec
Change-Id: I0bdcd13d884869a9ae3c7d14d2d74a4aeec6fe59
Martin Brabham [Mon, 3 Jun 2019 15:48:28 +0000 (08:48 -0700)]
[automerger skipped] Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into oc-dev am:
4823241553 am:
9cf0c2c6d2 am:
6f51f61aab -s ours
am:
e46949a6e4 -s ours
am skip reason: subject contains skip directive
Change-Id: I80d696d5e8b7edc00dd0c2ec6f9e8ab81b74eae3
Martin Brabham [Mon, 3 Jun 2019 15:48:09 +0000 (08:48 -0700)]
[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
ee34c562b2 am:
4fcab76aec am:
e89aa63902 -s ours
am:
4bf75ac4ad -s ours
am skip reason: subject contains skip directive
Change-Id: I2e4bdf497fe0752406df1d2508ca0adc00da8c24
Martin Brabham [Mon, 3 Jun 2019 15:41:29 +0000 (08:41 -0700)]
[automerger skipped] Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into oc-dev am:
4823241553 am:
9cf0c2c6d2
am:
6f51f61aab -s ours
am skip reason: subject contains skip directive
Change-Id: I10ca4405e203d9ecb9a31359410e57ac98db0db6
Martin Brabham [Mon, 3 Jun 2019 15:41:07 +0000 (08:41 -0700)]
[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
ee34c562b2 am:
4fcab76aec
am:
e89aa63902 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic13cb2ca31f5324e090f7d6d3de675f002a2724f
Martin Brabham [Mon, 3 Jun 2019 15:35:24 +0000 (08:35 -0700)]
Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into oc-dev am:
4823241553
am:
9cf0c2c6d2
Change-Id: I5fc2fe73c0d3a2ad34a3f6d320679b0920991940
Martin Brabham [Mon, 3 Jun 2019 15:35:07 +0000 (08:35 -0700)]
[automerger skipped] Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into pi-dev am:
efb7dfe6b4 -s ours
am:
bd193315a3
Change-Id: Ieb3d61fd49ba20349e43debb7f0d691fd4610d8a
Martin Brabham [Mon, 3 Jun 2019 15:35:07 +0000 (08:35 -0700)]
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
ee34c562b2
am:
4fcab76aec
Change-Id: Ib6cbfeb4f468b1a4a3180cb4f52ad5ff316daff7
Martin Brabham [Mon, 3 Jun 2019 15:31:05 +0000 (08:31 -0700)]
[automerger skipped] Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into pi-dev
am:
efb7dfe6b4 -s ours
am skip reason: subject contains skip directive
Change-Id: I27ff8d060a7a70e110f5c0522c858da3a264ff31
Martin Brabham [Mon, 3 Jun 2019 15:30:08 +0000 (08:30 -0700)]
Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into oc-dev
am:
4823241553
Change-Id: Ib6aefc575fd54ec07d9f4ae3c25e12b44e05dd29
Martin Brabham [Mon, 3 Jun 2019 15:30:07 +0000 (08:30 -0700)]
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
am:
ee34c562b2
Change-Id: I8f9c721a1c5186a579f95cdb1f44d0a8e5e14a87
TreeHugger Robot [Mon, 3 Jun 2019 15:14:28 +0000 (15:14 +0000)]
Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into pi-dev
TreeHugger Robot [Mon, 3 Jun 2019 15:14:18 +0000 (15:14 +0000)]
Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into oc-dev
Sumit Deshmukh [Mon, 3 Jun 2019 07:48:51 +0000 (00:48 -0700)]
Merge "BLE: [IOT] Initiate disconnection when encryption fails during pairing" am:
d4ce321925
am:
c60d118f65
Change-Id: I59375ac3c155d1454bd0e610dff05bdb50a31148
Sumit Deshmukh [Mon, 3 Jun 2019 07:42:51 +0000 (00:42 -0700)]
Merge "BLE: [IOT] Initiate disconnection when encryption fails during pairing"
am:
d4ce321925
Change-Id: Ifd3589b0b55ba1501e84251351f41b56886b32dc
Treehugger Robot [Mon, 3 Jun 2019 07:37:32 +0000 (07:37 +0000)]
Merge "BLE: [IOT] Initiate disconnection when encryption fails during pairing"
Martin Brabham [Mon, 3 Jun 2019 06:00:06 +0000 (23:00 -0700)]
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f" into oc-dev am:
594d13398c am:
fe782ba695 am:
63a7cba6ce am:
6ea4bb091f
am:
1e2cd3ca8b
Change-Id: Iead2e8a39a61b159234ba153b9e022617f422558
Martin Brabham [Mon, 3 Jun 2019 06:00:02 +0000 (23:00 -0700)]
[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP skipped:
17c45d587a am:
3547f78e99 am:
6eded7543a am:
5494852cb8 -s ours am:
cc7bc6b657 -s ours
am:
fa438cb286
Change-Id: Ib5d930c5ab72dd46b9281a28ef49ed58a33bbafe
Martin Brabham [Mon, 3 Jun 2019 05:54:20 +0000 (22:54 -0700)]
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f" into oc-dev am:
594d13398c am:
fe782ba695 am:
63a7cba6ce
am:
6ea4bb091f
Change-Id: If204b27b02811b81beb922b639e3a882192ce707
Martin Brabham [Mon, 3 Jun 2019 05:54:15 +0000 (22:54 -0700)]
[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP skipped:
17c45d587a am:
3547f78e99 am:
6eded7543a am:
5494852cb8 -s ours
am:
cc7bc6b657 -s ours
am skip reason: subject contains skip directive
Change-Id: Ibc7adffce927709c1e9395e61a5f894671d02c50
Martin Brabham [Mon, 3 Jun 2019 05:48:33 +0000 (22:48 -0700)]
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f" into oc-dev am:
594d13398c am:
fe782ba695
am:
63a7cba6ce
Change-Id: Icce93053514629dda42e58ee5628860d8aef8a78
Martin Brabham [Mon, 3 Jun 2019 05:48:29 +0000 (22:48 -0700)]
[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP skipped:
17c45d587a am:
3547f78e99 am:
6eded7543a
am:
5494852cb8 -s ours
am skip reason: subject contains skip directive
Change-Id: Id99b668d45dd746544d10dde38b5e9a6049ef92d
Martin Brabham [Mon, 3 Jun 2019 05:42:30 +0000 (22:42 -0700)]
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f" into oc-dev am:
594d13398c
am:
fe782ba695
Change-Id: I91c17faf64d9dd53095296852c20790a074ff1ff
Martin Brabham [Mon, 3 Jun 2019 05:42:27 +0000 (22:42 -0700)]
[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP skipped:
17c45d587a am:
3547f78e99
am:
6eded7543a
Change-Id: I3392b0dffc7f630ad2ebf06d817c717415c4c1d5
Martin Brabham [Mon, 3 Jun 2019 05:37:31 +0000 (22:37 -0700)]
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f" into oc-dev
am:
594d13398c
Change-Id: Iff0fa054a3bb4a685e77f421d868ad26a457cfa2
Martin Brabham [Mon, 3 Jun 2019 05:37:29 +0000 (22:37 -0700)]
[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP skipped:
17c45d587a
am:
3547f78e99
Change-Id: I7e50b87b5a855fc3e0414699c3328933ed8c4ced
Martin Brabham [Mon, 3 Jun 2019 05:36:54 +0000 (22:36 -0700)]
Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into qt-dev
am:
3e7b2389b3
Change-Id: I18867000754d905ac9a74a32f68b874d5f71e5c2
Martin Brabham [Mon, 3 Jun 2019 05:36:53 +0000 (22:36 -0700)]
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
am:
9437cbc240
Change-Id: Ieed181232321662023cf9864d64ab0bb0ebf2906
TreeHugger Robot [Mon, 3 Jun 2019 05:30:02 +0000 (05:30 +0000)]
Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into qt-dev
TreeHugger Robot [Mon, 3 Jun 2019 05:29:39 +0000 (05:29 +0000)]
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f" into oc-dev
* changes:
[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP skipped:
17c45d587a
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
Martin Brabham [Mon, 3 Jun 2019 05:06:26 +0000 (22:06 -0700)]
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f-nyc-mr1-dev-nyc-dev" into oc-dev am:
be07649450 am:
a13ce75b02 am:
908bb75ad7 am:
da4be3ef38
am:
7fa07236fd
Change-Id: Ia4348b98133a3c4a9934261e02fea633a147d6ff
Martin Brabham [Mon, 3 Jun 2019 05:06:22 +0000 (22:06 -0700)]
[automerger skipped] [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6 am:
6097686fc7 am:
0433d94f23 skipped:
4e06b9023f am:
f9ec56dffb am:
364dd10aed am:
89f3f95225 -s ours am:
bbaa32c57d -s ours
am:
c3fed5d94d
Change-Id: I70c978d7d7996aa10d18891ef469b2c57c87d842
Martin Brabham [Mon, 3 Jun 2019 05:00:24 +0000 (22:00 -0700)]
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f-nyc-mr1-dev-nyc-dev" into oc-dev am:
be07649450 am:
a13ce75b02 am:
908bb75ad7
am:
da4be3ef38
Change-Id: I776c14952a615388332a89ad4b3ba79eed6dfd8d
Martin Brabham [Mon, 3 Jun 2019 05:00:19 +0000 (22:00 -0700)]
[automerger skipped] [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6 am:
6097686fc7 am:
0433d94f23 skipped:
4e06b9023f am:
f9ec56dffb am:
364dd10aed am:
89f3f95225 -s ours
am:
bbaa32c57d -s ours
am skip reason: subject contains skip directive
Change-Id: Ia4682e4edcb9997d1537af5adc4c490723f8f861
Martin Brabham [Mon, 3 Jun 2019 04:54:53 +0000 (21:54 -0700)]
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f-nyc-mr1-dev-nyc-dev" into oc-dev am:
be07649450 am:
a13ce75b02
am:
908bb75ad7
Change-Id: If1007452948d2c8567c00559a548413ca22f6a7c
Martin Brabham [Mon, 3 Jun 2019 04:54:48 +0000 (21:54 -0700)]
[automerger skipped] [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6 am:
6097686fc7 am:
0433d94f23 skipped:
4e06b9023f am:
f9ec56dffb am:
364dd10aed
am:
89f3f95225 -s ours
am skip reason: subject contains skip directive
Change-Id: I2d6ca7256b59316bc67772463a8ce618d4e0fef2
Martin Brabham [Mon, 3 Jun 2019 04:48:52 +0000 (21:48 -0700)]
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f-nyc-mr1-dev-nyc-dev" into oc-dev am:
be07649450
am:
a13ce75b02
Change-Id: Ic94192cdb00bf8c7c3b151a3b43cf73aa88e56c6
Martin Brabham [Mon, 3 Jun 2019 04:48:48 +0000 (21:48 -0700)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6 am:
6097686fc7 am:
0433d94f23 skipped:
4e06b9023f am:
f9ec56dffb
am:
364dd10aed
Change-Id: Ie6a3e110a1c32bfa02518d94e4426a300021690e
Martin Brabham [Mon, 3 Jun 2019 04:42:51 +0000 (21:42 -0700)]
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f-nyc-mr1-dev-nyc-dev" into oc-dev
am:
be07649450
Change-Id: I40f15b86e59b389bb3fb8b5a061260d5976f7cbb
Martin Brabham [Mon, 3 Jun 2019 04:42:50 +0000 (21:42 -0700)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6 am:
6097686fc7 am:
0433d94f23 skipped:
4e06b9023f
am:
f9ec56dffb
Change-Id: Ia29d0d2bfeed91f75ab343953a09473c3442b958
Martin Brabham [Mon, 3 Jun 2019 04:31:26 +0000 (04:31 +0000)]
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f-nyc-mr1-dev-nyc-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6 am:
6097686fc7 am:
0433d94f23 skipped:
4e06b9023f
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6 am:
6097686fc7 am:
0433d94f23
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6 am:
6097686fc7
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
Jakub Pawlowski [Fri, 31 May 2019 23:51:16 +0000 (16:51 -0700)]
Merge "GD SMP ECC: Add const qualifier to ECC_PointMult" am:
f3136f33b4
am:
7276cd63ce
Change-Id: Ic30eba33a72fba45eaf8c8fab772d9243aec7fe2
Jakub Pawlowski [Fri, 31 May 2019 23:35:11 +0000 (16:35 -0700)]
Merge "GD SMP ECC: Add const qualifier to ECC_PointMult"
am:
f3136f33b4
Change-Id: I781d4aedae80ae00cd4e3493c8c7fc795f74fc15
Treehugger Robot [Fri, 31 May 2019 23:05:56 +0000 (23:05 +0000)]
Merge "GD SMP ECC: Add const qualifier to ECC_PointMult"
Martin Brabham [Fri, 31 May 2019 22:06:34 +0000 (15:06 -0700)]
[automerger skipped] [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
dff6cd84bc am:
a52bfe5e60 skipped:
58d5d4b7f7 am:
dc272a5302 am:
1422db72c6 am:
757fbd8c29 -s ours am:
e96ba65bf0 -s ours
am:
e45a19b97b
Change-Id: Idd919a232f2267f464284505425dcaa17ee5c95f
Martin Brabham [Fri, 31 May 2019 21:51:36 +0000 (14:51 -0700)]
[automerger skipped] [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
dff6cd84bc am:
a52bfe5e60 skipped:
58d5d4b7f7 am:
dc272a5302 am:
1422db72c6 am:
757fbd8c29 -s ours
am:
e96ba65bf0 -s ours
am skip reason: subject contains skip directive
Change-Id: I7a4b01acb8eeab6ea16f8f9c9f762658455adfd8
Martin Brabham [Fri, 31 May 2019 21:39:27 +0000 (14:39 -0700)]
[automerger skipped] [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
dff6cd84bc am:
a52bfe5e60 skipped:
58d5d4b7f7 am:
dc272a5302 am:
1422db72c6
am:
757fbd8c29 -s ours
am skip reason: subject contains skip directive
Change-Id: Iea59775e396c2eb224e7daa2f5532f15decb6c29
Martin Brabham [Fri, 31 May 2019 21:33:28 +0000 (14:33 -0700)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
dff6cd84bc am:
a52bfe5e60 skipped:
58d5d4b7f7 am:
dc272a5302
am:
1422db72c6
Change-Id: I04b90889c8186f3e21b73729e0e8f8cd1b6b2e3b
Martin Brabham [Fri, 31 May 2019 21:25:24 +0000 (14:25 -0700)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
dff6cd84bc am:
a52bfe5e60 skipped:
58d5d4b7f7
am:
dc272a5302
Change-Id: I8c85089522262e31ac3793184e34b28312750270
Jakub Pawlowski [Fri, 31 May 2019 20:18:54 +0000 (13:18 -0700)]
GD SMP: use fixed size arrays in packets am:
4ea3700df7
am:
7db273ee03
Change-Id: Id759b73a580d166741ec02dae2e6412e53d1cea4
Jakub Pawlowski [Fri, 31 May 2019 20:13:52 +0000 (13:13 -0700)]
GD SMP: use fixed size arrays in packets
am:
4ea3700df7
Change-Id: Idbd285f34f15fc9436739d8efd4fd6aeeb0a4d15
Android Build Merger (Role) [Fri, 31 May 2019 18:12:16 +0000 (18:12 +0000)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6 am:
6097686fc7 am:
0433d94f23 skipped:
4e06b9023f
Change-Id: I216ca30d63a6706f8a61c79d36dc83cb7836b186
Android Build Merger (Role) [Fri, 31 May 2019 18:12:14 +0000 (18:12 +0000)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6 am:
6097686fc7 am:
0433d94f23
Change-Id: I5e14764ec590cace5feddb7636c771b6febb5ca0
Android Build Merger (Role) [Fri, 31 May 2019 18:12:13 +0000 (18:12 +0000)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6 am:
6097686fc7
Change-Id: I2752af09d0dcf821f29f2e423220e1b13ef15396
Android Build Merger (Role) [Fri, 31 May 2019 18:12:11 +0000 (18:12 +0000)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6
Change-Id: Iaee48fb07517f32ea191eff26f359eca7151cd38
Android Build Merger (Role) [Fri, 31 May 2019 18:12:10 +0000 (18:12 +0000)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c
Change-Id: I025a3f1c1f261dfbc1b9bda02c835f437d85fcaa
Martin Brabham [Wed, 29 May 2019 19:16:59 +0000 (12:16 -0700)]
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
Bug:
110433804
Test: Manual; atest net_test_bluetooth
Change-Id: I84d50604dee67a01855228c72bb7e8d484de951c
Jakub Pawlowski [Fri, 31 May 2019 12:16:35 +0000 (14:16 +0200)]
GD SMP: use fixed size arrays in packets
Test: compilation
Bug:
126463795
Change-Id: Iad1fd5004efab67294c6926475625e4c4b35a38c
Jakub Pawlowski [Fri, 31 May 2019 16:11:34 +0000 (09:11 -0700)]
PDL: fixed size type arrays am:
a1a27f8f4c
am:
eef379ed12
Change-Id: Ie4e641c354137483ed440f1b1796ad76768388df
Jakub Pawlowski [Fri, 31 May 2019 15:56:55 +0000 (08:56 -0700)]
PDL: fixed size type arrays
am:
a1a27f8f4c
Change-Id: I179ac2bd7dca5ccf27049a1c89a7e8d765dcc669
Jakub Pawlowski [Fri, 31 May 2019 12:07:44 +0000 (14:07 +0200)]
PDL: fixed size type arrays
Currently attempt to add fixed size array is causing segfault. This
patch fixes that. It also adds a test to verify those arrays are
properly encoded and decoded.
Test: bluetooth_packet_parser_test
Change-Id: I09c7e5595a7d1819a43e9203846bb487fb23aca3
Cheney Ni [Fri, 31 May 2019 06:03:04 +0000 (23:03 -0700)]
[automerger skipped] Make sure the Hearing Aid source is ready before resuming or suspending calls
am:
2e4fd6f728 -s ours
am skip reason: change_id I6ae11faab3d530c65f55ffa9b8a9f3cae2bde5f4 with SHA1
39be24184d is in history
Change-Id: I4f19bed3a887f1bb04bb48542841ed411f7849a2
Hansong Zhang [Thu, 30 May 2019 23:58:26 +0000 (16:58 -0700)]
HCI Layer: Register CommandComplete and CommandStatus on Start() am:
712e9e2f79
am:
67a90bfa38
Change-Id: Ie392080c64d01df56d26f850018ca30f7845a40b
Hansong Zhang [Thu, 30 May 2019 23:51:39 +0000 (16:51 -0700)]
HCI Layer: Register CommandComplete and CommandStatus on Start()
am:
712e9e2f79
Change-Id: Id706b779f96c5e9ddfc7f994e9e4d83c65898b99
Hansong Zhang [Thu, 30 May 2019 00:52:24 +0000 (17:52 -0700)]
HCI Layer: Register CommandComplete and CommandStatus on Start()
Module.GetHandler() works only after a Module is started. Move
RegisterEventHandler() for CommandComplete and CommandStatus to Start().
Test: atest bluetooth_test_gd --host
Change-Id: I7331c8ddb8d61d697aa4480e7c591c3817d21afa
Jakub Pawlowski [Thu, 30 May 2019 18:12:43 +0000 (11:12 -0700)]
Merge "PDL: Add Arrays" am:
7d7dd39e90
am:
14e1e56692
Change-Id: Id8a55227d06aee5f5c30106a8743429073e2a951
Jakub Pawlowski [Thu, 30 May 2019 17:57:36 +0000 (10:57 -0700)]
Merge "PDL: Add Arrays"
am:
7d7dd39e90
Change-Id: I56e5fdfba619fb7ea9cede16320c1be360b80133
Jakub Pawlowski [Thu, 30 May 2019 17:45:17 +0000 (17:45 +0000)]
Merge "PDL: Add Arrays"
Android Build Merger (Role) [Thu, 30 May 2019 16:56:02 +0000 (16:56 +0000)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
dff6cd84bc am:
a52bfe5e60 skipped:
58d5d4b7f7
Change-Id: I2e5ee164ea33bc6f845e34bc39a24f0080d9bbe9
Android Build Merger (Role) [Thu, 30 May 2019 16:55:59 +0000 (16:55 +0000)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
dff6cd84bc am:
a52bfe5e60
Change-Id: I8d3abdacbf67c5f8cbd1cf3b1fb63528b4a95811
Android Build Merger (Role) [Thu, 30 May 2019 16:55:56 +0000 (16:55 +0000)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
dff6cd84bc
Change-Id: I3d8a71cad06115d2be87a8c8a6b961ffa2827709
Martin Brabham [Wed, 29 May 2019 19:16:59 +0000 (12:16 -0700)]
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
Bug:
110433804
Test: Manual; atest net_test_bluetooth
Change-Id: I84d50604dee67a01855228c72bb7e8d484de951c
Cheney Ni [Fri, 24 May 2019 06:59:43 +0000 (14:59 +0800)]
Make sure the Hearing Aid source is ready before resuming or suspending calls
Those calls to resume / suspend streaming are from the audio's IPC
threads like HwBinder or UIPC, and calls to start / end session are from
the stack main thread. There is timing that those threads may run in
parallel, and trys to change the streaming state when the Hearing Aid
source is not ready. This change checks the source state before resuming
or suspending streaming, and breaks the deadlock between IPC threads and
the stack main thread.
Bug:
132860565
Test: 1. Connected to a Hearing Aids and disable the Bluetooth
2. Switch the active device manually
Change-Id: I6ae11faab3d530c65f55ffa9b8a9f3cae2bde5f4
Merged-In: I6ae11faab3d530c65f55ffa9b8a9f3cae2bde5f4
(cherry picked from commit
39be24184d752b29d4a2b4cbcc537edfb4ee0acb)
weichinweng [Thu, 30 May 2019 07:00:50 +0000 (00:00 -0700)]
[automerger skipped] Merge "Open connection if it doesn't exsist in bta_gattc_process_indicate" into qt-dev
am:
8c3e9415af -s ours
am skip reason: change_id I1b3415ef6aafb52a6ac229409514a85f35de5842 with SHA1
ffc9591983 is in history
Change-Id: I6ddf6a7ba7d23868ded2349c1265ab1b8b9acb15
TreeHugger Robot [Thu, 30 May 2019 06:22:12 +0000 (06:22 +0000)]
Merge "Open connection if it doesn't exsist in bta_gattc_process_indicate" into qt-dev
Cheney Ni [Thu, 30 May 2019 03:21:46 +0000 (20:21 -0700)]
Merge "Make sure the Hearing Aid source is ready before resuming or suspending calls" am:
f58ec178f5
am:
96be569a8c
Change-Id: I8c81fb44c22901a2e61d65e374119e44864b075e
Cheney Ni [Thu, 30 May 2019 03:16:45 +0000 (20:16 -0700)]
Merge "Make sure the Hearing Aid source is ready before resuming or suspending calls"
am:
f58ec178f5
Change-Id: Ied52e1d024172e4cb369b0af3641f04e294c195c
Treehugger Robot [Thu, 30 May 2019 02:58:08 +0000 (02:58 +0000)]
Merge "Make sure the Hearing Aid source is ready before resuming or suspending calls"
Android Build Merger (Role) [Wed, 29 May 2019 19:18:00 +0000 (19:18 +0000)]
[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP skipped:
17c45d587a
Change-Id: I7677e2e0a7bf0f67e881a29fecd104c7e70cd0bf
Martin Brabham [Wed, 29 May 2019 19:16:59 +0000 (12:16 -0700)]
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
Bug:
110433804
Test: Manual; atest net_test_bluetooth
Change-Id: I84d50604dee67a01855228c72bb7e8d484de951c
Martin Brabham [Fri, 24 May 2019 22:13:38 +0000 (15:13 -0700)]
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
Bug:
110433804
Test: Manual; atest net_test_bluetooth
Change-Id: If65a8d53ff368ba3ddddb47cfc0072469090b46a
(cherry picked from commit
ddae6274742e241c03526c7659dca7b3446b9f8d)
Martin Brabham [Fri, 24 May 2019 22:13:38 +0000 (15:13 -0700)]
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
Bug:
110433804
Test: Manual; atest net_test_bluetooth
Change-Id: If65a8d53ff368ba3ddddb47cfc0072469090b46a
(cherry picked from commit
ddae6274742e241c03526c7659dca7b3446b9f8d)
Martin Brabham [Fri, 24 May 2019 22:13:38 +0000 (15:13 -0700)]
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
Bug:
110433804
Test: Manual; atest net_test_bluetooth
Change-Id: If65a8d53ff368ba3ddddb47cfc0072469090b46a
(cherry picked from commit
ddae6274742e241c03526c7659dca7b3446b9f8d)
Myles Watson [Wed, 6 Feb 2019 22:02:36 +0000 (14:02 -0800)]
PDL: Add Arrays
Test: bluetooth_packet_parser_test
Change-Id: If7f057a16ab40066a53d2c66980c5579a480650f
OSDN Git Service
