OSDN Git Service
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: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
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: 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
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: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
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: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)]
[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:37:29 +0000 (22:37 -0700)]
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
am:
9437cbc240
Change-Id: I5dc0364f54a04dcb13a6fe8be16fd98355406320
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: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: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: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
Martin Brabham [Fri, 31 May 2019 22:03:43 +0000 (15:03 -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: I2da46ad44d562c94d5633cf46f02cbbe00089f21
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
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
Cheney Ni [Fri, 31 May 2019 06:03:04 +0000 (23:03 -0700)]
Make sure the Hearing Aid source is ready before resuming or suspending calls
am:
2e4fd6f728
Change-Id: I3d483a0d35b19defe7be94b53f9c6dd5cf1f7b20
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:51 +0000 (00:00 -0700)]
Merge "Open connection if it doesn't exsist in bta_gattc_process_indicate" into qt-dev
am:
8c3e9415af
Change-Id: I7bc7abd759f0ef495a592998f205da7a720d732f
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
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)
Jakub Pawlowski [Wed, 29 May 2019 18:07:45 +0000 (11:07 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf am:
c366796512 skipped:
d1443d1913 am:
e1fb3fdd61 am:
a65c805c8c am:
46d990360b -s ours am:
8c6b9cc5cb -s ours
am:
b8b04c3cb5
Change-Id: Iae66f9b1172ddc53df141aaf205de471d1d2a9b3
Jakub Pawlowski [Wed, 29 May 2019 18:03:44 +0000 (11:03 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf am:
c366796512 skipped:
d1443d1913 am:
e1fb3fdd61 am:
a65c805c8c am:
46d990360b -s ours
am:
8c6b9cc5cb -s ours
am skip reason: subject contains skip directive
Change-Id: I3c886016dbfb5c3f5bc54b491772b494d567b058
Jakub Pawlowski [Wed, 29 May 2019 17:57:39 +0000 (10:57 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf am:
c366796512 skipped:
d1443d1913 am:
e1fb3fdd61 am:
a65c805c8c
am:
46d990360b -s ours
am skip reason: subject contains skip directive
Change-Id: I12088a8d0fcd6faa30f5b0e4ca5dbc8d4dd88c05
Jakub Pawlowski [Wed, 29 May 2019 17:52:39 +0000 (10:52 -0700)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf am:
c366796512 skipped:
d1443d1913 am:
e1fb3fdd61
am:
a65c805c8c
Change-Id: I550868a91866949b0ee0e4d2f5d5031f079a824a
Jakub Pawlowski [Wed, 29 May 2019 17:48:40 +0000 (10:48 -0700)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf am:
c366796512 skipped:
d1443d1913
am:
e1fb3fdd61
Change-Id: I802c3d22a7934f0d84dcbead758bfcad9195e401
weichinweng [Wed, 29 May 2019 06:27:15 +0000 (14:27 +0800)]
Open connection if it doesn't exsist in bta_gattc_process_indicate
If Service Changed indication is received before the connection is open
, send the BTA_GATTC_INT_CONN_EVT to open it before processing the
indication.
Bug:
131814072
Test: CTS Bluetooth LE Secure Test. Unit test.
Change-Id: I1b3415ef6aafb52a6ac229409514a85f35de5842
Merged-In: I1b3415ef6aafb52a6ac229409514a85f35de5842
Android Build Merger (Role) [Tue, 28 May 2019 19:22:47 +0000 (19:22 +0000)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf am:
c366796512 skipped:
d1443d1913
Change-Id: I48d0148eb1a45e93105b3baf6a42ba91221fc402
Android Build Merger (Role) [Tue, 28 May 2019 19:22:45 +0000 (19:22 +0000)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf am:
c366796512
Change-Id: I1f9eb6a5010e8ffef7b7e0912b7f6ce81067ccec
Android Build Merger (Role) [Tue, 28 May 2019 19:22:44 +0000 (19:22 +0000)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf
Change-Id: I040da3eb560786454a69d3230cf7d559a98c9818
Android Build Merger (Role) [Tue, 28 May 2019 19:22:42 +0000 (19:22 +0000)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462
Change-Id: I5af312e49f6c6440ae31d8bb55d1ed3311a46e43
Android Build Merger (Role) [Tue, 28 May 2019 19:22:40 +0000 (19:22 +0000)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9
Change-Id: Id63bf05a79287ec45942647075c715e858f915d1
Jakub Pawlowski [Fri, 24 May 2019 20:01:09 +0000 (22:01 +0200)]
DO NOT MERGE Send HCI Read Encryption Key properly
This patch fixes bad HCI command being send instead of Read Encryption
Key Size.
Bug:
124301137
Test: pair and connect with Bluetooth headset
Change-Id: If325ef2771ca1546ae58df7c684f66ae537b8573
Ted Wang [Mon, 27 May 2019 02:01:30 +0000 (19:01 -0700)]
Merge "Disable absolute volume control for AirPods 2" into qt-dev
am:
961d96bbf6
Change-Id: Icc2f288f7b284e4a44c316b0e67b6ac03b9e1af5
Ted Wang [Mon, 27 May 2019 01:51:19 +0000 (01:51 +0000)]
Merge "Disable absolute volume control for AirPods 2" into qt-dev
Ted Wang [Thu, 23 May 2019 11:26:34 +0000 (19:26 +0800)]
Disable absolute volume control for AirPods 2
Volume of AirPods 2 start out extremely loud when absolute volume
enabled. Interim response from remote show normal when register volume
changed notification. Disable absolute volume control for AirPods 2 to
avoid volume start out extremely loud.
Bug:
129602489
Test: Play music with AirPods 2
Merged-In: I555576be1929a42ae8e01f661572a89d1993dee9
Change-Id: I555576be1929a42ae8e01f661572a89d1993dee9
Ugo Yu [Tue, 21 May 2019 20:18:35 +0000 (13:18 -0700)]
Merge "Pairng: Fix crosskey paring" into qt-dev
am:
079ebe2abe
Change-Id: I17d332aff290b362bb1e88613e99430d3b211ef7
TreeHugger Robot [Tue, 21 May 2019 18:40:52 +0000 (18:40 +0000)]
Merge "Pairng: Fix crosskey paring" into qt-dev
Ugo Yu [Fri, 19 Apr 2019 09:40:38 +0000 (17:40 +0800)]
Pairng: Fix crosskey paring
* 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:
130553855
Fixes:
128518468
Test: pair between two dual mode phones, starting from SMP first to
trigger crosskey pairing
Change-Id: I56f3071595a6fb0cb5fe4df63eae33f8d4858141
Martin Brabham [Thu, 16 May 2019 03:17:46 +0000 (20:17 -0700)]
NIAP: Add a new argument to determine single user mode status.
am:
1a88ace397
Change-Id: Ic11ae11c2101131880701812eec4380e98e8226a
Martin Brabham [Thu, 16 May 2019 03:17:32 +0000 (20:17 -0700)]
Revert "btif: Short circuit NIAP key attestation check"
am:
1a275856ab
Change-Id: I310fbe186ef01ad39a49665577e49d1df3137374
Martin Brabham [Fri, 10 May 2019 19:42:15 +0000 (12:42 -0700)]
NIAP: Add a new argument to determine single user mode status.
This is being used to section off the feature to single user mode
devices as provisioned devices requiring compliance will be
single user mode only. This is a stop-gap waiting on a vendor code fix.
RE keystore (qseecom) problems: b/
129759834
Bug: b/
117993149
Test: atest net_test_bluetooth
Change-Id: I4fb3f4e663a051db8f8ba12901a20fa18ebf197e
Martin Brabham [Mon, 22 Apr 2019 18:26:02 +0000 (11:26 -0700)]
Revert "btif: Short circuit NIAP key attestation check"
This reverts commit
24200b230ab9c5dec4f3f10a4b36cf7f84515e05.
Bug:
117993149
Android Build Merger (Role) [Fri, 10 May 2019 19:23:20 +0000 (19:23 +0000)]
Merge changes from topic "am-
850e8d8f178c4deab0c5779bfd339edb" into qt-dev
* changes:
[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev am:
3bf41c03e0 am:
6479bff4cf -s ours am:
743f7856b2 -s ours am:
2685a77b62 -s ours am skip reason: subject contains skip directive
[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
cd7bdf4cc3 am:
7316c97cd1 -s ours am:
6d827a4be2 -s ours am:
459c49e908 -s ours am skip reason: subject contains skip directive
Myles Watson [Fri, 10 May 2019 19:22:26 +0000 (12:22 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev am:
3bf41c03e0 am:
6479bff4cf -s ours am:
743f7856b2 -s ours
am:
2685a77b62 -s ours
am skip reason: subject contains skip directive
Change-Id: I5e96cb704542fca1b942f764b5372741bc858c7b
Myles Watson [Fri, 10 May 2019 19:21:52 +0000 (12:21 -0700)]
[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
cd7bdf4cc3 am:
7316c97cd1 -s ours am:
6d827a4be2 -s ours
am:
459c49e908 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib8e3671ae80e0c870b8867e2bbfac831c97367b5
Myles Watson [Fri, 10 May 2019 19:07:40 +0000 (12:07 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev am:
3bf41c03e0 am:
6479bff4cf -s ours
am:
743f7856b2 -s ours
am skip reason: subject contains skip directive
Change-Id: Iff03c5de4fab55d3bc54812f776040464011ac9e
Myles Watson [Fri, 10 May 2019 19:07:00 +0000 (12:07 -0700)]
[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
cd7bdf4cc3 am:
7316c97cd1 -s ours
am:
6d827a4be2 -s ours
am skip reason: subject contains skip directive
Change-Id: Ice25049f5b4e398e21345d3f6f69088cd68389cb
Myles Watson [Fri, 10 May 2019 19:03:13 +0000 (12:03 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev am:
3bf41c03e0
am:
6479bff4cf -s ours
am skip reason: change_id If8652936eb3b24b3d1b3fded0be200bb986b70e3 with SHA1
c0c3804acd is in history
Change-Id: I0e3438cb5090abcb65e4863ff725db2fe8b35f30
Myles Watson [Fri, 10 May 2019 19:01:54 +0000 (12:01 -0700)]
[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
cd7bdf4cc3
am:
7316c97cd1 -s ours
am skip reason: change_id If8652936eb3b24b3d1b3fded0be200bb986b70e3 with SHA1
c0c3804acd is in history
Change-Id: If63f87a0300606a903bc8f7e9af6fb8e0ad708fd
Myles Watson [Fri, 10 May 2019 18:56:51 +0000 (11:56 -0700)]
Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev
am:
3bf41c03e0
Change-Id: Iea733c12789b381728a66f9de7c60c9420072cf1
Myles Watson [Fri, 10 May 2019 18:56:27 +0000 (11:56 -0700)]
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
am:
cd7bdf4cc3
Change-Id: I3f1d66a7c9da0740c0086d061a9cfc7c8ce0909a
Peter Collingbourne [Fri, 10 May 2019 17:45:48 +0000 (10:45 -0700)]
Revert "Preserve x18 while calling aptX encoder libraries."
This reverts commit
8a25a1756b5600ea65134fe8f7729228ad8c535f which was a
workaround for an issue with prebuilts that has now been fixed.
Bug:
112907825
Bug:
120621517
Change-Id: Ia61b1b3a238716f7e7860a356eac086a79a07742
TreeHugger Robot [Fri, 10 May 2019 00:21:24 +0000 (00:21 +0000)]
Merge "Add Delay reporting for Hearing Aids" into qt-dev
Myles Watson [Thu, 9 May 2019 21:40:46 +0000 (14:40 -0700)]
Merge changes from topic "am-
52079082-d7b1-4194-aa18-
1c17fa700e34" into oc-dev am:
c322f3baa3 am:
7642947735 am:
d7a673d47f
am:
5b80ee9db6
Change-Id: Icfcb0bb3ee591fa8ad1d918696e8117fd0d2029d
Myles Watson [Thu, 9 May 2019 21:39:49 +0000 (14:39 -0700)]
[automerger skipped] [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0 skipped:
a328e6dc05 am:
2cef3d79da am:
dbad5b2a65 am:
b4318e302a -s ours
am:
c18375ab9c -s ours
am skip reason: subject contains skip directive
Change-Id: I62b912a903fd900156210184434eed0d3d73037b
Myles Watson [Thu, 9 May 2019 20:59:21 +0000 (13:59 -0700)]
Merge changes from topic "am-
52079082-d7b1-4194-aa18-
1c17fa700e34" into oc-dev am:
c322f3baa3 am:
7642947735
am:
d7a673d47f
Change-Id: I92608bcb41ffaddddebb1e0c1469572fb93f4b24
Myles Watson [Thu, 9 May 2019 20:58:26 +0000 (13:58 -0700)]
[automerger skipped] [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0 skipped:
a328e6dc05 am:
2cef3d79da am:
dbad5b2a65
am:
b4318e302a -s ours
am skip reason: subject contains skip directive
Change-Id: I5439bd2d0cdcf8546a48ca5327e0f598f8c85e61