OSDN Git Service
Ugo Yu [Wed, 5 Jun 2019 17:35:19 +0000 (10:35 -0700)]
Rename and reset the proirity of HID host thread am:
4e25ef13b2
am:
76e26cffbb
Change-Id: I0dccf0d64ce506a61f11fe411b27f9b2cc339d9d
Ugo Yu [Wed, 5 Jun 2019 17:30:25 +0000 (10:30 -0700)]
Rename and reset the proirity of HID host thread
am:
4e25ef13b2
Change-Id: If957c7e793d4ae2462d9b1c5a57e17a91224d02a
Ugo Yu [Wed, 5 Jun 2019 12:08:29 +0000 (20:08 +0800)]
Rename and reset the proirity of HID host thread
* Rename the HH event polling thread to bt_hh_thread
* HH event polling thread is created by bt_main_thread
with RT priority. Lower the thread priority since the
tasks in this thread is not timing critical
Bug:
131787936
Test: Connect to a HID device
Run "adb shell ps -A -T -Z -O rtprio"
Change-Id: Ibd983e96bc339393842d4c2e2aa226534095e225
Ugo Yu [Wed, 5 Jun 2019 04:09:41 +0000 (21:09 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
b751ea3a90 am:
2b3330a139 -s ours am:
d9997755f9 -s ours am:
0f3b13b40e -s ours
am:
a2185db6d3 -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
Change-Id: Idc71ae33d1290847f33c1f040dabe79bcaa5f767
Ugo Yu [Wed, 5 Jun 2019 04:09:29 +0000 (21:09 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
5240e71881 am:
5f8f0c8b74 -s ours am:
1d7523417e -s ours am:
1c2cf08476 -s ours
am:
28c62892b6 -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
Change-Id: I187533195bf8dadbbe002259b03679349f10954f
Jakub Pawlowski [Wed, 5 Jun 2019 04:09:07 +0000 (21:09 -0700)]
Merge "Hearing Aid: properly track audio Suspend/Resume" into qt-dev
am:
24e8293439
Change-Id: I93aca174d8272b3ff8f39dacf194584f38002ba5
Ugo Yu [Wed, 5 Jun 2019 04:07:13 +0000 (21:07 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
b751ea3a90 am:
2b3330a139 -s ours am:
d9997755f9 -s ours
am:
0f3b13b40e -s ours
am skip reason: subject contains skip directive
Change-Id: I55f9c0499721b51ba077b8743835fbead8edc775
Ugo Yu [Wed, 5 Jun 2019 04:07:07 +0000 (21:07 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
5240e71881 am:
5f8f0c8b74 -s ours am:
1d7523417e -s ours
am:
1c2cf08476 -s ours
am skip reason: subject contains skip directive
Change-Id: I72d5bbb01e393fb940bad5cc58e51e71f6d5b200
Ugo Yu [Wed, 5 Jun 2019 03:56:43 +0000 (20:56 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
b751ea3a90 am:
2b3330a139 -s ours
am:
d9997755f9 -s ours
am skip reason: subject contains skip directive
Change-Id: Idcf3e6f5276592b17693e89c8a56b37c7b445688
Ugo Yu [Wed, 5 Jun 2019 03:56:38 +0000 (20:56 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
5240e71881 am:
5f8f0c8b74 -s ours
am:
1d7523417e -s ours
am skip reason: subject contains skip directive
Change-Id: I2b8a32d29676a1ea7de1d26f700a5ac1930ea385
TreeHugger Robot [Wed, 5 Jun 2019 03:54:08 +0000 (03:54 +0000)]
Merge "Hearing Aid: properly track audio Suspend/Resume" into qt-dev
Ugo Yu [Wed, 5 Jun 2019 03:51:54 +0000 (20:51 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
b751ea3a90
am:
2b3330a139 -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
Change-Id: I739288fe523814fce940eb2b33aa84d328af92c0
Ugo Yu [Wed, 5 Jun 2019 03:51:42 +0000 (20:51 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
5240e71881
am:
5f8f0c8b74 -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
Change-Id: I03fe1c7c5a372fd126e9885a4412c2b63b138751
Ugo Yu [Wed, 5 Jun 2019 03:44:59 +0000 (20:44 -0700)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev
am:
b751ea3a90
Change-Id: I4fd4b7d5d0328f40688fa2cd2321b95c12beb99e
Ugo Yu [Wed, 5 Jun 2019 03:44:47 +0000 (20:44 -0700)]
DO NOT MERGE Separate SDP procedure from bonding state (1/2)
am:
5240e71881
Change-Id: I12aa00ba24326d58ce73f15b6ddc82f22201945e
TreeHugger Robot [Wed, 5 Jun 2019 03:26:32 +0000 (03:26 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev
Ugo Yu [Wed, 5 Jun 2019 03:05:35 +0000 (20:05 -0700)]
Merge changes from topic "am-
d2784a9e-cd2f-4414-b4db-
f53b523a7b87" into oc-dev am:
421f1492da am:
c0f88cbbfd am:
fa24cbf097 am:
7625320871
am:
d3d63acf58
Change-Id: Ie7a9f9d96f6a7cdbb906cfb1faa2d0ad80cf5350
Ugo Yu [Wed, 5 Jun 2019 03:05:29 +0000 (20:05 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0 am:
db47d7e348 am:
6976e5f214 skipped:
575b8c810b am:
5b7685e7a2 am:
f4da01925c am:
0a1f845e2a -s ours am:
840a9ba63e -s ours
am:
36c6a3069a
Change-Id: I55f77ba77a635ca91d384885641d0180562372dd
Ugo Yu [Wed, 5 Jun 2019 02:49:23 +0000 (19:49 -0700)]
Merge changes from topic "am-
d2784a9e-cd2f-4414-b4db-
f53b523a7b87" into oc-dev am:
421f1492da am:
c0f88cbbfd am:
fa24cbf097
am:
7625320871
Change-Id: I4e49782d45cd3132456019979e20e8c63fe58def
Ugo Yu [Wed, 5 Jun 2019 02:49:18 +0000 (19:49 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0 am:
db47d7e348 am:
6976e5f214 skipped:
575b8c810b am:
5b7685e7a2 am:
f4da01925c am:
0a1f845e2a -s ours
am:
840a9ba63e -s ours
am skip reason: subject contains skip directive
Change-Id: Ib56723082e3f9696d84423d254b5830af5e19253
Myles Watson [Wed, 5 Jun 2019 02:43:18 +0000 (19:43 -0700)]
Use Start for testing and add a Stop timeout am:
879fbfbed8
am:
92d634aabc
Change-Id: Ibf32b3fc7b1859b337ed93b950fb36d4032fd84a
Myles Watson [Wed, 5 Jun 2019 02:41:15 +0000 (19:41 -0700)]
Use Start for testing and add a Stop timeout
am:
879fbfbed8
Change-Id: I3ae3d628144a8aadd91f86814513f28413d4d60e
Ugo Yu [Wed, 5 Jun 2019 02:34:05 +0000 (19:34 -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: Ic1ea931b012821a763fba3972694bac0c928aa2b
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
Ugo Yu [Wed, 5 Jun 2019 02:31:14 +0000 (19:31 -0700)]
Merge changes from topic "am-
d2784a9e-cd2f-4414-b4db-
f53b523a7b87" into oc-dev am:
421f1492da am:
c0f88cbbfd
am:
fa24cbf097
Change-Id: I332b22ee718458d95df4e549238244f3117aa294
Ugo Yu [Wed, 5 Jun 2019 02:31:09 +0000 (19:31 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0 am:
db47d7e348 am:
6976e5f214 skipped:
575b8c810b am:
5b7685e7a2 am:
f4da01925c
am:
0a1f845e2a -s ours
am skip reason: subject contains skip directive
Change-Id: Ice9aadfba47ba6e146de0123f17d7703b650605a
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 [Thu, 23 May 2019 11:54:41 +0000 (19:54 +0800)]
DO NOT MERGE Separate SDP procedure from bonding state (1/2)
- Do not stay in bonding state if the device is paried but still
discovering service.
- Report BOND_BONDED to Java after authentication for a classic
Bluetooth device is completed.
- Send BONDING event to Java when static identity address is
first obtained during crosskey pairing
- Send BONDING event to Java for the initial random address
before send BONDED event
- Do not send bond event for static identity address when SDP is done.
- Make sure pairing control block always get cleaned up when both SDP
and pairing are done
- Send empty UUIDs to Java layer to unblock bonding intent broadcast
when SDP fails
Bug:
79703832
Test: runtest bluetooth, regression test
Change-Id: I60d8883e6d095b440cce49686a2049c8b5660235
Merged-In: I8a98ba2178039e25c65fc701855066a8788312e6
Ugo Yu [Wed, 5 Jun 2019 01:55:52 +0000 (18:55 -0700)]
Merge changes from topic "am-
d2784a9e-cd2f-4414-b4db-
f53b523a7b87" into oc-dev am:
421f1492da
am:
c0f88cbbfd
Change-Id: I5f81bb5a561e3da0a06d4d75f99f7894648b82d6
Ugo Yu [Wed, 5 Jun 2019 01:55:48 +0000 (18:55 -0700)]
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0 am:
db47d7e348 am:
6976e5f214 skipped:
575b8c810b am:
5b7685e7a2
am:
f4da01925c
Change-Id: I548d7448fa6562b01ca6f8d7b63621f17679945c
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
Ugo Yu [Wed, 5 Jun 2019 01:03:32 +0000 (18:03 -0700)]
Merge changes from topic "am-
d2784a9e-cd2f-4414-b4db-
f53b523a7b87" into oc-dev
am:
421f1492da
Change-Id: I7644ef835cc0177d110de369dfae0a01225bdcbb
Ugo Yu [Wed, 5 Jun 2019 01:03:30 +0000 (18:03 -0700)]
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0 am:
db47d7e348 am:
6976e5f214 skipped:
575b8c810b
am:
5b7685e7a2
Change-Id: I13263a937d23bbfd624afcb92f5a4b76f240a258
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
Myles Watson [Tue, 7 May 2019 00:54:51 +0000 (17:54 -0700)]
Use Start for testing and add a Stop timeout
Test: atest --host bluetooth_test_gd
Change-Id: Ib966f46a35572dfbe05a10e3d44c4b4503d616a3
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
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
TreeHugger Robot [Tue, 4 Jun 2019 16:39:19 +0000 (16:39 +0000)]
Merge changes from topic "am-
d2784a9e-cd2f-4414-b4db-
f53b523a7b87" into oc-dev
* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0 am:
db47d7e348 am:
6976e5f214 skipped:
575b8c810b
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0 am:
db47d7e348 am:
6976e5f214
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0 am:
db47d7e348
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719
DO NOT MERGE Separate SDP procedure from bonding state (1/2)
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
OSDN Git Service
