OSDN Git Service
Jakub Pawlowski [Wed, 5 Jun 2019 02:59:42 +0000 (19:59 -0700)]
Hearing Aid: properly track audio Suspend/Resume am:
054762bcfe am:
463943aa34
am:
13702b2b3a
Change-Id: I785d45549cada1b07f21ea1ccee709d7f3723366
Ugo Yu [Wed, 5 Jun 2019 02:53:41 +0000 (19:53 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev am:
1ab9bad8f3 -s ours am:
cc98ca6dd2 -s ours am:
f92efc538b
am:
cf25e64512
Change-Id: Ia042235ae5f0c7106e0bb013b63411f889ccaf88
Ugo Yu [Wed, 5 Jun 2019 02:53:05 +0000 (19:53 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
9d5a28a536 -s ours am:
4a0d26a8f3 -s ours am:
2bd5b33135
am:
d644d68960
Change-Id: I6d464fa55bb072a92150eb64962ba6a652216360
Ugo Yu [Wed, 5 Jun 2019 02:50:44 +0000 (19:50 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev am:
e488319d82 -s ours am:
c7ee86a352
am:
8573f48dfe
Change-Id: I53f890ea204a8c3afccd6c95da09301522125114
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 02:21:21 +0000 (19:21 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev am:
1ab9bad8f3 -s ours am:
cc98ca6dd2 -s ours
am:
f92efc538b
Change-Id: Iae50a817a62c92c3455477cf8576471ca86429c3
Ugo Yu [Wed, 5 Jun 2019 02:20:28 +0000 (19:20 -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: I4094119aabecb737afce2a82a09d4711ddf52cb3
Ugo Yu [Wed, 5 Jun 2019 02:15:46 +0000 (19:15 -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: I8a5f0c4846a71dd0ee1146ac7b5a4f7208cf9fa9
Ugo Yu [Wed, 5 Jun 2019 01:13:02 +0000 (18:13 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev am:
1ab9bad8f3 -s ours
am:
cc98ca6dd2 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic22afab361dac6bbdde1f7c792886197b62d873d
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:56:38 +0000 (12:56 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev
am:
1ab9bad8f3 -s ours
am skip reason: subject contains skip directive
Change-Id: I3bc81925f4a8a1f8d467d348fa5844fd1230cf6c
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:33:21 +0000 (17:33 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev
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:07:28 +0000 (15:07 -0700)]
OS: Add death tests for en/de-queue registration am:
b06e0b59cb am:
33efc477d7
am:
5cce48ff73
Change-Id: Iea2e9ee11cd5ab6a2252e51da255145826da574f
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:48:37 +0000 (14:48 -0700)]
Revert "OS: Construct Handler using Reactor" am:
dde08cdba3 am:
6a5abebe4a
am:
0a235fd686
Change-Id: I5fc9a7cb950477b7f08b355a5fc0fcd27a0947fc
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:58:34 +0000 (08:58 -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
am:
304d0664e1
Change-Id: I896e7aedbc0fd38875c7e813a540e8bb17b9699a
Martin Brabham [Mon, 3 Jun 2019 15:58:16 +0000 (08:58 -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
am:
a35cd91c73
Change-Id: I2566f1d9f8fd0ac6cdb5a8b442f1534d37bdb6f8
Martin Brabham [Mon, 3 Jun 2019 15:57:39 +0000 (08:57 -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
am:
6272b5243b
Change-Id: I07127a4cf3896c94b01f4c6eeb7834725fe4d389
Martin Brabham [Mon, 3 Jun 2019 15:57:17 +0000 (08:57 -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
am:
ac74568698
Change-Id: I41981207a4eda86781995d08dfa86afa6588eb69
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:42 +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: I98a220f040b32092cee5434c91d56ee8558b2c83
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:51:13 +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: Ib97410acc9ed4640c10115a7421303bd9ff3a385
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
Android Build Merger (Role) [Mon, 3 Jun 2019 15:41:25 +0000 (15:41 +0000)]
Merge "[automerger skipped] Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into pi-dev am:
efb7dfe6b4 -s ours am:
bd193315a3 am:
3e1cf764a4" into qt-r1-dev-plus-aosp
Martin Brabham [Mon, 3 Jun 2019 15:41:08 +0000 (08:41 -0700)]
[automerger skipped] Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into pi-dev am:
efb7dfe6b4 -s ours am:
bd193315a3
am:
ede3ccd7e2
Change-Id: I58c8d417e568839a3f09587076f9fe4c69738389
Martin Brabham [Mon, 3 Jun 2019 15:41:08 +0000 (08:41 -0700)]
[automerger skipped] Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into pi-dev am:
efb7dfe6b4 -s ours am:
bd193315a3
am:
3e1cf764a4
Change-Id: Ic09e0137afc0c19fbe026e443be27948b260b5d8
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)]
[automerger skipped] Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into pi-dev am:
efb7dfe6b4 -s ours
am:
bd193315a3
Change-Id: Ie68e43da54508ddd778615aade55bede02f937d3
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:52:53 +0000 (00:52 -0700)]
Merge "BLE: [IOT] Initiate disconnection when encryption fails during pairing" am:
d4ce321925 am:
c60d118f65
am:
508da42aa4
Change-Id: I40dd7a7a371b586461d6b8b86d5c0f13780473b7
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"
Android Build Merger (Role) [Mon, 3 Jun 2019 06:06:45 +0000 (06:06 +0000)]
Merge changes from topic "am-
0b75f9eed71b4b948852ccf40b367617" into qt-r1-dev-plus-aosp
* changes:
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f" into oc-dev am:
594d13398c am:
fe782ba695 am:
63a7cba6ce am:
6ea4bb091f am:
1e2cd3ca8b am:
7bafb17c68
[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 am:
9fed7e9ee5
Martin Brabham [Mon, 3 Jun 2019 06:06:20 +0000 (23:06 -0700)]
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f" into oc-dev am:
594d13398c am:
fe782ba695 am:
63a7cba6ce am:
6ea4bb091f am:
1e2cd3ca8b
am:
7bafb17c68
Change-Id: I50970c68a1660963da6fb30c3cf81d62e41edebd
Martin Brabham [Mon, 3 Jun 2019 06:06:16 +0000 (23:06 -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
am:
9fed7e9ee5
Change-Id: I3dda5c3c5169b1b8a45b61de6583788bc1e0dfe0
Martin Brabham [Mon, 3 Jun 2019 06:06:07 +0000 (23:06 -0700)]
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f" into oc-dev am:
594d13398c am:
fe782ba695 am:
63a7cba6ce am:
6ea4bb091f am:
1e2cd3ca8b
am:
f6b55f3037
Change-Id: I68bcb0c328ede23896366f6685d10a647ded4ee9
Martin Brabham [Mon, 3 Jun 2019 06:06:02 +0000 (23:06 -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
am:
69535695bf
Change-Id: I513affb01992e86ec93f80a35628174a3eccea36
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: Ib5f5343132658cf6b4a345b2de899a9cff9921fe
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 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: I08bcb4f276ec12a3e02f8edfbab40dbb339bc786
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
Android Build Merger (Role) [Mon, 3 Jun 2019 05:42:57 +0000 (05:42 +0000)]
Merge "Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into qt-dev am:
3e7b2389b3 am:
b2f74b411e" into qt-r1-dev-plus-aosp
Martin Brabham [Mon, 3 Jun 2019 05:42:48 +0000 (22:42 -0700)]
Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into qt-dev am:
3e7b2389b3
am:
b2f74b411e
Change-Id: I3af1f4923920c405d5c465a1031ee74a52e9b435
Martin Brabham [Mon, 3 Jun 2019 05:42:46 +0000 (22:42 -0700)]
Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into qt-dev am:
3e7b2389b3
am:
9a5365be8e
Change-Id: I8100b943e59c30227d1d4bfbd12173dc16bde2fd
Android Build Merger (Role) [Mon, 3 Jun 2019 05:42:41 +0000 (05:42 +0000)]
Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
9437cbc240 am:
ef5c697bb5" into qt-r1-dev-plus-aosp
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:28 +0000 (22:42 -0700)]
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
9437cbc240
am:
d410951ff4
Change-Id: I40f974b39ca91680e4cf299c762d71334dcef36c
Martin Brabham [Mon, 3 Jun 2019 05:42:28 +0000 (22:42 -0700)]
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
9437cbc240
am:
ef5c697bb5
Change-Id: Ie150588879921e8ea574438e99326f7502b3dbcc
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:30 +0000 (22:37 -0700)]
Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into qt-dev
am:
3e7b2389b3
Change-Id: I50eb747f0e4d1621080333f2a649061a0274556f
Martin Brabham [Mon, 3 Jun 2019 05:37:29 +0000 (22:37 -0700)]
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
am:
9437cbc240
Change-Id: I5dc0364f54a04dcb13a6fe8be16fd98355406320
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
Android Build Merger (Role) [Mon, 3 Jun 2019 05:12:52 +0000 (05:12 +0000)]
Merge changes from topic "am-
02ae75363fd84e8781d8fd500b91e0ca" into qt-r1-dev-plus-aosp
* changes:
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 am:
73a719e46e
[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 am:
d1706619ef
Martin Brabham [Mon, 3 Jun 2019 05:12:28 +0000 (22:12 -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
am:
73a719e46e
Change-Id: Iafa96f65a1e1bf11618daad40907b71931eaf126
Martin Brabham [Mon, 3 Jun 2019 05:12:27 +0000 (22:12 -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
am:
177a9259c6
Change-Id: Icbdff210d1d5962fdf196f21ae7099c983b339d6
Martin Brabham [Mon, 3 Jun 2019 05:12:23 +0000 (22:12 -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
am:
d1706619ef
Change-Id: I712aba9afdf4cadbb575fec15bc821a56a0611f1
Martin Brabham [Mon, 3 Jun 2019 05:12:23 +0000 (22:12 -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
am:
60172a15aa
Change-Id: Ie9d9ccc88dcb879c5af21996cd5e13eb4faf4e0b
Martin Brabham [Mon, 3 Jun 2019 05:06:27 +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: Id169c8b1ad8fffc16ef1e88b97836713ece3c285
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: I74ff2670c472b66151ed246f3302b1541d9174d9
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
OSDN Git Service
