OSDN Git Service
Myles Watson [Tue, 14 May 2019 23:00:16 +0000 (16:00 -0700)]
Merge "HCI: Add classic interface definitions" am:
b8b18593c6
am:
5408e7b9b1
Change-Id: Ic5738cd2f7a7b99dac25e85384f8cf2943f1dd2a
Myles Watson [Tue, 14 May 2019 22:55:11 +0000 (15:55 -0700)]
Merge "HCI: Add classic interface definitions"
am:
b8b18593c6
Change-Id: If2710b9c0327ac8456984722524d464512abfe81
Treehugger Robot [Tue, 14 May 2019 22:27:20 +0000 (22:27 +0000)]
Merge "HCI: Add classic interface definitions"
Myles Watson [Sat, 23 Feb 2019 00:08:06 +0000 (16:08 -0800)]
HCI: Add classic interface definitions
Test: bluetooth_test_gd --gtest_filter=*Hci*
Change-Id: I4206c818084302341d4e99f2cce8aad1c12ce4ae
Myles Watson [Fri, 10 May 2019 20:21:21 +0000 (13:21 -0700)]
[automerger skipped] Merge changes from topic "am-
850e8d8f178c4deab0c5779bfd339edb" into qt-dev
am:
81b014e9ef -s ours
am skip reason: change_id If8652936eb3b24b3d1b3fded0be200bb986b70e3 with SHA1
c0c3804acd is in history
Change-Id: I6306edf628b4806b34dea49282a4014d75604ed0
Peter Collingbourne [Fri, 10 May 2019 20:18:03 +0000 (13:18 -0700)]
Revert "Preserve x18 while calling aptX encoder libraries."
am:
7d05765de0
Change-Id: I24bb7473eca3cd80f0c055abb4991edaab3beb0c
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
Stanley Tng [Fri, 10 May 2019 06:05:50 +0000 (23:05 -0700)]
[automerger skipped] Merge "Add Delay reporting for Hearing Aids" into qt-dev
am:
c0d922f138 -s ours
am skip reason: change_id If4bef049c18a3912817c2fa96b9bd890d5712c22 with SHA1
94f3a3ac7a is in history
Change-Id: Ia79d0371e1962832d830032870ddd5aa049ab7cc
Myles Watson [Fri, 10 May 2019 01:10:00 +0000 (18:10 -0700)]
Merge changes from topic "am-
52079082-d7b1-4194-aa18-
1c17fa700e34" into oc-dev am:
c322f3baa3 am:
7642947735 am:
d7a673d47f am:
5b80ee9db6
am:
019ee2043d
Change-Id: Iad442b7ac44fc953080321aa3e08ab684ee50d80
Xin Li [Fri, 10 May 2019 00:59:03 +0000 (17:59 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into " am:
7bd0d9e0c3 -s ours
am:
4be54ee7bf -s ours
am skip reason: subject contains skip directive
Change-Id: I9274b8dc105aed74902d59c2ca38837c05cf13eb
Android Build Merger (Role) [Fri, 10 May 2019 00:50:03 +0000 (00:50 +0000)]
Merge "[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into am:
e39adc7f03 -s ours am:
251879b510 -s ours am skip reason: subject contains skip directive" into qt-dev-plus-aosp
Myles Watson [Fri, 10 May 2019 00:40:27 +0000 (17:40 -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:
a1a09e4bf5
Change-Id: Ia66c3003622e415d853876687ed7c52bd5b20c11
Xin Li [Fri, 10 May 2019 00:29:10 +0000 (17:29 -0700)]
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into am:
e39adc7f03 -s ours
am:
251879b510 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifc11e13a9c356f467fcdc6618fbd89477fb66151
TreeHugger Robot [Fri, 10 May 2019 00:21:24 +0000 (00:21 +0000)]
Merge "Add Delay reporting for Hearing Aids" into qt-dev
Xin Li [Thu, 9 May 2019 23:54:54 +0000 (16:54 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into "
am:
7bd0d9e0c3 -s ours
am skip reason: subject contains skip directive
Change-Id: I0a6eb0daaa03161d899b838f88945cc06bac056f
Stanley Tng [Thu, 9 May 2019 23:17:27 +0000 (16:17 -0700)]
Merge "Add Delay reporting for Hearing Aids" am:
122ce6871f
am:
9bae14294d
Change-Id: I7377397bbc73484457247961f650a96449213325
Xin Li [Thu, 9 May 2019 23:14:15 +0000 (16:14 -0700)]
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into
am:
e39adc7f03 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie61608aea918084208a6cc25b5f39c9567ee611e
Xin Li [Thu, 9 May 2019 22:05:45 +0000 (22:05 +0000)]
Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into "
Stanley Tng [Thu, 9 May 2019 21:45:03 +0000 (14:45 -0700)]
Merge "Add Delay reporting for Hearing Aids"
am:
122ce6871f
Change-Id: If98f6b3faad73841924abdf92b2a4b09ac9411b9
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 21:07:45 +0000 (14:07 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-mr1-dev am:
bff76f0800 -s ours am:
dc3ea8739a -s ours
am:
52836e9963
Change-Id: I0c792174a9a56b233741257d8b3b31923c2a2e9d
Myles Watson [Thu, 9 May 2019 21:06:16 +0000 (14:06 -0700)]
[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
c0c3804acd -s ours am:
3f561b74af -s ours
am:
14fa281af5
Change-Id: I462a6ae33eca3d7b40fda3f8e885b5b53440a423
Myles Watson [Thu, 9 May 2019 21:05:16 +0000 (14:05 -0700)]
[automerger skipped] Merge "DO NOT MERGE Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into pi-dev am:
c43cbc7075 -s ours
am:
99e865fec0
Change-Id: Ifc100125a206c087abc37d7744f6b5b7db76913a
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
Treehugger Robot [Thu, 9 May 2019 20:51:00 +0000 (20:51 +0000)]
Merge "Add Delay reporting for Hearing Aids"
Stanley Tng [Thu, 2 May 2019 22:49:17 +0000 (15:49 -0700)]
Add Delay reporting for Hearing Aids
Use the RenderDelay parameter from the Hearing Aid devices to implement
the Delay Reporting feature. This will helps in the lip-sync issues.
Please note that this change will requires a re-pair of the Hearing Aids
devices in order for the delay report to work well.
Bug:
132115153
Test: Manual test
Change-Id: If4bef049c18a3912817c2fa96b9bd890d5712c22
(cherry picked from commit
94f3a3ac7aaeb75af5182654ee173998f8dee07b)
Merged-In: If4bef049c18a3912817c2fa96b9bd890d5712c22
Myles Watson [Thu, 9 May 2019 20:31:17 +0000 (13:31 -0700)]
[automerger skipped] DO NOT MERGE Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
6d9d811e1a -s ours
am:
fb3b0ad4a4
Change-Id: I08b507e49c2a05b19ae75686dcdfc9d9fe262dac
TreeHugger Robot [Thu, 9 May 2019 20:20:23 +0000 (20:20 +0000)]
Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev
Myles Watson [Thu, 9 May 2019 20:12:39 +0000 (13:12 -0700)]
Merge changes from topic "am-
52079082-d7b1-4194-aa18-
1c17fa700e34" into oc-dev am:
c322f3baa3
am:
7642947735
Change-Id: I5e720a69941ff5ce5873ed154fcd8fb6fde523e1
Myles Watson [Thu, 9 May 2019 20:11:31 +0000 (13:11 -0700)]
[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
Change-Id: I14e32670ab2e0dbaa948585fe2952aecdb13b280
Myles Watson [Thu, 9 May 2019 19:35:17 +0000 (12:35 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-mr1-dev am:
bff76f0800 -s ours
am:
dc3ea8739a -s ours
am skip reason: subject contains skip directive
Change-Id: I976218ca4bccaff64195deccb627d3f6369b22c4
Myles Watson [Thu, 9 May 2019 19:34:36 +0000 (12:34 -0700)]
[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
c0c3804acd -s ours
am:
3f561b74af -s ours
am skip reason: subject contains skip directive
Change-Id: Ibb02ce20ebe2d1785d8b4b3a5596e4dfae856142
Myles Watson [Thu, 9 May 2019 19:33:12 +0000 (12:33 -0700)]
Merge changes from topic "am-
52079082-d7b1-4194-aa18-
1c17fa700e34" into oc-dev
am:
c322f3baa3
Change-Id: I6b0940b2f486f0b433e0fda5274b10fc3b2b082d
Myles Watson [Thu, 9 May 2019 19:32:16 +0000 (12:32 -0700)]
[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
Change-Id: I6af0d17305a6fbede200e3ee0e1e951f0232ff01
Myles Watson [Thu, 9 May 2019 19:31:00 +0000 (12:31 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-mr1-dev
am:
bff76f0800 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic0c4e506c02980debe71e25fa373d5bad2863f63
Myles Watson [Thu, 9 May 2019 19:30:32 +0000 (12:30 -0700)]
[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
am:
c0c3804acd -s ours
am skip reason: subject contains skip directive
Change-Id: Ia75f800491c79738150fa89028fabbe2d1c22d18
Myles Watson [Thu, 9 May 2019 19:19:21 +0000 (12:19 -0700)]
[automerger skipped] Merge "DO NOT MERGE Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into pi-dev
am:
c43cbc7075 -s ours
am skip reason: subject contains skip directive
Change-Id: I9693b38ac16ec7b6eeb6c6ef479a51e74ab0e09b
Myles Watson [Thu, 9 May 2019 19:12:42 +0000 (12:12 -0700)]
[automerger skipped] DO NOT MERGE Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
am:
6d9d811e1a -s ours
am skip reason: subject contains skip directive
Change-Id: I1a1fc90b0b5d15315ada952005c6290ecca3d47f
TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]
Merge changes from topic "am-
52079082-d7b1-4194-aa18-
1c17fa700e34" into oc-dev
* changes:
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0 skipped:
a328e6dc05
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
TreeHugger Robot [Thu, 9 May 2019 18:47:49 +0000 (18:47 +0000)]
Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-mr1-dev
TreeHugger Robot [Thu, 9 May 2019 18:47:28 +0000 (18:47 +0000)]
Merge "DO NOT MERGE Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into pi-dev
Xin Li [Thu, 9 May 2019 16:27:06 +0000 (09:27 -0700)]
DO NOT MERGE - Merge Pie Bonito/Sargo into master.
Bug:
131756210
Change-Id: I4009cad536b5c2d7a9f9d02769128dc5077e53b9
Myles Watson [Thu, 9 May 2019 05:23:06 +0000 (22:23 -0700)]
HCI: Rename ErrorCodes and consolidate Enable am:
38ea5acca8
am:
89b34388c1
Change-Id: I9f7f9808f21d4f569b4a6a4dec4cf65fdf991b0c
Myles Watson [Thu, 9 May 2019 04:53:54 +0000 (21:53 -0700)]
HCI: Rename ErrorCodes and consolidate Enable
am:
38ea5acca8
Change-Id: Ifa89f600275e8259c37fbddc02dd1e2f66b9112e
Weichin Weng [Thu, 9 May 2019 04:31:46 +0000 (21:31 -0700)]
[automerger skipped] Merge "Close unexpected HearingAid open event if is not attempting to connect" into qt-dev
am:
dc8e335c24 -s ours
am skip reason: change_id I75d63d0441dcc6b7338b1e30453021eb271f4872 with SHA1
ee7320a5a1 is in history
Change-Id: If253581bd09c183bca2f9c80f19c99f3879e12c8
Weichin Weng [Thu, 9 May 2019 02:54:25 +0000 (02:54 +0000)]
Merge "Close unexpected HearingAid open event if is not attempting to connect" into qt-dev
Stanley Tng [Thu, 2 May 2019 22:49:17 +0000 (15:49 -0700)]
Add Delay reporting for Hearing Aids
Use the RenderDelay parameter from the Hearing Aid devices to implement
the Delay Reporting feature. This will helps in the lip-sync issues.
Please note that this change will requires a re-pair of the Hearing Aids
devices in order for the delay report to work well.
Bug:
132115153
Test: Manual test
Change-Id: If4bef049c18a3912817c2fa96b9bd890d5712c22
Myles Watson [Wed, 8 May 2019 23:15:01 +0000 (16:15 -0700)]
HCI: Rename ErrorCodes and consolidate Enable
Test: bluetooth_gd_test --gtest_filter=*HciTest*
Change-Id: Ic957968b5f0de1eac486b4e2ba103ec749819b0e
Satish kumar sugasi [Wed, 8 May 2019 20:16:35 +0000 (13:16 -0700)]
[automerger skipped] Merge "A2DP: Fix offload start VSC parameters" into qt-dev
am:
f8cada81b7 -s ours
am skip reason: change_id I3908abcb8f7703e4b89513ed473f6949b3c1bbe3 with SHA1
cf284d29a9 is in history
Change-Id: Ifaae14f064e2f228f360e70bef5dde69aea9a4f9
TreeHugger Robot [Wed, 8 May 2019 19:47:14 +0000 (19:47 +0000)]
Merge "A2DP: Fix offload start VSC parameters" into qt-dev
Martin Brabham [Wed, 8 May 2019 17:33:14 +0000 (10:33 -0700)]
[automerger skipped] Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev am:
99a0259cf3 am:
dd2e11092a am:
1a99efee01 -s ours am:
62d14464c4 -s ours
am:
dd0670dde1
Change-Id: Idbbf2494cc1c6b8caf7221ad4bb741bef9b24924
Martin Brabham [Wed, 8 May 2019 17:04:14 +0000 (10:04 -0700)]
[automerger skipped] Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev am:
99a0259cf3 am:
dd2e11092a am:
1a99efee01 -s ours
am:
62d14464c4 -s ours
am skip reason: subject contains skip directive
Change-Id: Idc3fbc8ff1f84825f1407e80388632d7591ad347
Martin Brabham [Wed, 8 May 2019 16:58:11 +0000 (09:58 -0700)]
[automerger skipped] Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev am:
99a0259cf3 am:
dd2e11092a
am:
1a99efee01 -s ours
am skip reason: subject contains skip directive
Change-Id: Id031a291948c84874a9d70b87cfe4ed57f1ed389
Martin Brabham [Wed, 8 May 2019 16:45:37 +0000 (09:45 -0700)]
Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev am:
99a0259cf3
am:
dd2e11092a
Change-Id: I5dcb7baaf68e522a0604a30c53be5d61bf315a73
Martin Brabham [Wed, 8 May 2019 16:39:30 +0000 (09:39 -0700)]
Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev
am:
99a0259cf3
Change-Id: Ic593d9a4c421539181402c39860db5771a8f1417
TreeHugger Robot [Wed, 8 May 2019 16:30:02 +0000 (16:30 +0000)]
Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev
Hansong Zhang [Wed, 8 May 2019 06:32:06 +0000 (23:32 -0700)]
ModuleRegistry: Start() injected modules am:
30fa258cf8
am:
104b1ffd15
Change-Id: Ic7896c719e5bf52594141f2c6e6c2422614ab1bf
Ted Wang [Wed, 8 May 2019 06:30:23 +0000 (23:30 -0700)]
[automerger skipped] Merge "Fix potential OOB read in sdpu_get_len_from_type" into oc-dev am:
cd20f25a79 -s ours am:
d76a5a7532 -s ours am:
5d37d19091 -s ours am:
22ce813ca2 -s ours
am:
b9400cdabd -s ours
am skip reason: change_id I3755e13ee0a7e22ffd5f48fca909610a26b09d0a with SHA1
1243f8da33 is in history
Change-Id: I9e5523bf9d1b8b5cb6c108324c056e2d1b615e6c
Hansong Zhang [Wed, 8 May 2019 06:10:49 +0000 (23:10 -0700)]
ModuleRegistry: Start() injected modules
am:
30fa258cf8
Change-Id: I096fdf186f33e9e690e5dd564f4b5ac28b71701b
Ted Wang [Wed, 8 May 2019 05:51:52 +0000 (22:51 -0700)]
[automerger skipped] Merge "Fix potential OOB read in sdpu_get_len_from_type" into oc-dev am:
cd20f25a79 -s ours am:
d76a5a7532 -s ours am:
5d37d19091 -s ours
am:
22ce813ca2 -s ours
am skip reason: change_id I3755e13ee0a7e22ffd5f48fca909610a26b09d0a with SHA1
1243f8da33 is in history
Change-Id: Id0f8d3d489e5b9b19697c6345bf7da7586fc894e
Ted Wang [Wed, 8 May 2019 04:59:25 +0000 (21:59 -0700)]
[automerger skipped] Merge "Fix potential OOB read in sdpu_get_len_from_type" into oc-dev am:
cd20f25a79 -s ours am:
d76a5a7532 -s ours
am:
5d37d19091 -s ours
am skip reason: change_id I3755e13ee0a7e22ffd5f48fca909610a26b09d0a with SHA1
08202bdcbe is in history
Change-Id: I7df90c8eb729337eb6d6e4425214676a9d0dc32d
Ted Wang [Wed, 8 May 2019 04:26:09 +0000 (21:26 -0700)]
[automerger skipped] Merge "Fix potential OOB read in sdpu_get_len_from_type" into oc-dev am:
cd20f25a79 -s ours
am:
d76a5a7532 -s ours
am skip reason: change_id I3755e13ee0a7e22ffd5f48fca909610a26b09d0a with SHA1
08202bdcbe is in history
Change-Id: Ic1064df1d0f2d24d74e030112040e4b53101e7ba
Ted Wang [Wed, 8 May 2019 04:06:54 +0000 (21:06 -0700)]
[automerger skipped] Merge "Fix potential OOB read in sdpu_get_len_from_type" into oc-dev
am:
cd20f25a79 -s ours
am skip reason: change_id I3755e13ee0a7e22ffd5f48fca909610a26b09d0a with SHA1
08202bdcbe is in history
Change-Id: I8465f167bb3054270c8ab3222835bca9096f8212
TreeHugger Robot [Wed, 8 May 2019 03:35:08 +0000 (03:35 +0000)]
Merge "Fix potential OOB read in sdpu_get_len_from_type" into oc-dev
Hansong Zhang [Tue, 7 May 2019 23:40:45 +0000 (16:40 -0700)]
ModuleRegistry: Start() injected modules
Call Start() on injected modules, and set registry_ and handler_
properly
Test: atest --host bluetooth_test_gd
Change-Id: Id655d537982eab285549ff797a907dabb15ca64d
Ted Wang [Tue, 7 May 2019 22:43:54 +0000 (15:43 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041 am:
9683021f70 skipped:
d691b2dd00 am:
5c82fb9354 am:
ee88b904c5 am:
6e197e9332 -s ours am:
b7cbe692a1 -s ours
am:
35eaaa76c6 -s ours
am skip reason: change_id I3755e13ee0a7e22ffd5f48fca909610a26b09d0a with SHA1
1243f8da33 is in history
Change-Id: I2f2ea464558af3b98e451e44742ca33306ce72f8
Ted Wang [Tue, 7 May 2019 22:30:17 +0000 (15:30 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041 am:
9683021f70 skipped:
d691b2dd00 am:
5c82fb9354 am:
ee88b904c5 am:
6e197e9332 -s ours
am:
b7cbe692a1 -s ours
am skip reason: subject contains skip directive
Change-Id: If1c8417e32909db7846cf1256dbb5b19642983e1
Ted Wang [Tue, 7 May 2019 22:27:13 +0000 (15:27 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041 am:
9683021f70 skipped:
d691b2dd00 am:
5c82fb9354 am:
ee88b904c5
am:
6e197e9332 -s ours
am skip reason: subject contains skip directive
Change-Id: I34a6387c4d3eb5eebe2a94b6ec84a409a6f20808
Ted Wang [Tue, 7 May 2019 22:14:26 +0000 (15:14 -0700)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041 am:
9683021f70 skipped:
d691b2dd00 am:
5c82fb9354
am:
ee88b904c5
Change-Id: I1aa9a18fd7e1ccdcc89227d732a7ab758d62ae18
Ted Wang [Tue, 7 May 2019 22:01:21 +0000 (15:01 -0700)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041 am:
9683021f70 skipped:
d691b2dd00
am:
5c82fb9354
Change-Id: Ia977c5381d95449adf2e20692c23dcd00c9b3fd9
Chienyuan [Tue, 7 May 2019 21:53:36 +0000 (14:53 -0700)]
Merge "Add benchmark for queue" am:
7ec4793b50
am:
d6088efbdc
Change-Id: Ieab227b589d2c6681ba1d65d989f2f04b33cff8a
Chienyuan [Tue, 7 May 2019 21:44:03 +0000 (14:44 -0700)]
Merge "Add benchmark for queue"
am:
7ec4793b50
Change-Id: I9586994386bbf51fae402424b66c3fa955c29a76
Treehugger Robot [Tue, 7 May 2019 21:36:41 +0000 (21:36 +0000)]
Merge "Add benchmark for queue"
Android Build Merger (Role) [Tue, 7 May 2019 21:14:39 +0000 (21:14 +0000)]
Merge "[automerger skipped] Merge "Handling of incoming AVRCP Controller connections" into qt-dev am:
0c6ec01d88 -s ours am skip reason: change_id I15abd2fd4bc963889d6cdfe9364a651e2b4c3c10 with SHA1
03806fcdd6 is in history" into qt-dev-plus-aosp
Sal Savage [Tue, 7 May 2019 21:14:27 +0000 (14:14 -0700)]
[automerger skipped] Merge "Handling of incoming AVRCP Controller connections" into qt-dev
am:
0c6ec01d88 -s ours
am skip reason: change_id I15abd2fd4bc963889d6cdfe9364a651e2b4c3c10 with SHA1
03806fcdd6 is in history
Change-Id: I0586d4d5cc16d8581693c6c6a64298dbb195d550
Sal Savage [Tue, 7 May 2019 20:49:56 +0000 (13:49 -0700)]
[automerger skipped] Merge "Handling of incoming AVRCP Controller connections" into qt-dev
am:
0c6ec01d88 -s ours
am skip reason: change_id I15abd2fd4bc963889d6cdfe9364a651e2b4c3c10 with SHA1
03806fcdd6 is in history
Change-Id: Ife7acbf21b18c8eb572d93835ac3b6b0a513e3b8
Sal Savage [Tue, 7 May 2019 20:20:22 +0000 (20:20 +0000)]
Merge "Handling of incoming AVRCP Controller connections" into qt-dev
Martin Brabham [Tue, 7 May 2019 20:13:16 +0000 (13:13 -0700)]
[automerger skipped] DO NOT MERGE: osi: Offload mutex pointer to local scope am:
947c58718f -s ours
am:
67014f8193
Change-Id: I241c3aacf9b8c6b72dc9e13af3731519cc6d50b0
Martin Brabham [Tue, 7 May 2019 19:51:58 +0000 (12:51 -0700)]
[automerger skipped] DO NOT MERGE: osi: Offload mutex pointer to local scope
am:
947c58718f -s ours
am skip reason: subject contains skip directive
Change-Id: Ic551ed6e5bc89f72c7c2531dc019384d02c3ecef
Martin Brabham [Thu, 4 Apr 2019 21:57:41 +0000 (14:57 -0700)]
DO NOT MERGE: osi: Offload mutex pointer to local scope
Create a shared_ptr for the callback_mutex in the alarm struct.
When performing the callback, make a local shared_ptr reference.
lock_guard on the local shared_ptr reference.
Bug:
117997080
Test: atest net_test_bluetooth
Change-Id: Iab800f720f4ccc4735e4d494e0d458eb97b40a4a
Martin Brabham [Thu, 4 Apr 2019 21:57:41 +0000 (14:57 -0700)]
DO NOT MERGE: osi: Offload mutex pointer to local scope
Create a shared_ptr for the callback_mutex in the alarm struct.
When performing the callback, make a local shared_ptr reference.
lock_guard on the local shared_ptr reference.
Bug:
117997080
Test: atest net_test_bluetooth
Change-Id: Iab800f720f4ccc4735e4d494e0d458eb97b40a4a
Joseph Pirozzo [Thu, 2 May 2019 23:45:03 +0000 (16:45 -0700)]
Handling of incoming AVRCP Controller connections
Resolve edge cases on incoming AVRCP Controllers Remote Controller
cases, both caused the remote control component to either generate an
out of bounds error or fail to update peer features.
Test: receive incoming AVRCP connection
Bug:
130750865
Change-Id: I15abd2fd4bc963889d6cdfe9364a651e2b4c3c10
Merged-In: I15abd2fd4bc963889d6cdfe9364a651e2b4c3c10
Joseph Pirozzo [Tue, 7 May 2019 15:48:08 +0000 (08:48 -0700)]
Merge "Handling of incoming AVRCP Controller connections" am:
e7b536bc93
am:
e4107c877e
Change-Id: I82c81153d3da27154d69e17797481c30a1f061c5
Joseph Pirozzo [Tue, 7 May 2019 15:41:55 +0000 (08:41 -0700)]
Merge "Handling of incoming AVRCP Controller connections"
am:
e7b536bc93
Change-Id: I7574cd7421edb6572472ffef685b70429f6d8d2a
Joseph Pirozzo [Tue, 7 May 2019 15:29:52 +0000 (15:29 +0000)]
Merge "Handling of incoming AVRCP Controller connections"
Weichin Weng [Tue, 7 May 2019 04:15:55 +0000 (21:15 -0700)]
Merge "Close unexpected HearingAid open event if is not attempting to connect" am:
f612b732e1
am:
450cefe766
Change-Id: I8c4c157f44bda64a868cb92b5da6fbadcc6a4b66
Weichin Weng [Tue, 7 May 2019 04:12:53 +0000 (21:12 -0700)]
Merge "Close unexpected HearingAid open event if is not attempting to connect"
am:
f612b732e1
Change-Id: Id6ca92d830e6e7f10d22260c15f6b47fea3b80fa
weichinweng [Sat, 4 May 2019 00:49:24 +0000 (08:49 +0800)]
Close unexpected HearingAid open event if is not attempting to connect
When HearingAid bta layer receive unexpected HearingAid open event,
should close it if is not attempting to connect.
Bug:
131863877
Test: 1.Forget/Repair HearingAid device from Bluetooth UI.
2.Disconnect/Reconnect HearingAid device from Bluetooth UI.
3.HearingAid device power off/on, check them can reconnect.
Change-Id: I75d63d0441dcc6b7338b1e30453021eb271f4872
Merged-In: I75d63d0441dcc6b7338b1e30453021eb271f4872
Weichin Weng [Tue, 7 May 2019 03:49:50 +0000 (03:49 +0000)]
Merge "Close unexpected HearingAid open event if is not attempting to connect"
OSDN Git Service
