OSDN Git Service

android-x86/system-bt.git
4 years agoMerge "Fix L2CAP cert and remove legacy HCI cert" am: 7061aeec12 am: 403c7eedbb
Automerger Merge Worker [Wed, 8 Jan 2020 22:46:47 +0000 (22:46 +0000)]
Merge "Fix L2CAP cert and remove legacy HCI cert" am: 7061aeec12 am: 403c7eedbb

Change-Id: Ib4389ef978efda65a473c415f4e363e9819fa77b

4 years agoMerge "Remove unused BTM_SEC and BTU_HH defines" am: 71f2804103 am: 756a0a3a10
Automerger Merge Worker [Wed, 8 Jan 2020 22:45:17 +0000 (22:45 +0000)]
Merge "Remove unused BTM_SEC and BTU_HH defines" am: 71f2804103 am: 756a0a3a10

Change-Id: I018d237d8d4444220424485345eaebfa4565d111

4 years agoMerge "Fix L2CAP cert and remove legacy HCI cert"
Hansong Zhang [Wed, 8 Jan 2020 22:08:06 +0000 (14:08 -0800)]
Merge "Fix L2CAP cert and remove legacy HCI cert"
am: 7061aeec12

Change-Id: I6fb34005537960b1da2058f8d4a4bf5102a21405

4 years agoMerge "Remove unused BTM_SEC and BTU_HH defines"
Hansong Zhang [Wed, 8 Jan 2020 22:07:22 +0000 (14:07 -0800)]
Merge "Remove unused BTM_SEC and BTU_HH defines"
am: 71f2804103

Change-Id: Ibbbe6b2ca2c70beda502b6350ce499d47719a1b4

4 years agoMerge "Fix L2CAP cert and remove legacy HCI cert"
Treehugger Robot [Wed, 8 Jan 2020 21:47:13 +0000 (21:47 +0000)]
Merge "Fix L2CAP cert and remove legacy HCI cert"

4 years agoMerge "Remove unused BTM_SEC and BTU_HH defines"
Treehugger Robot [Wed, 8 Jan 2020 21:10:09 +0000 (21:10 +0000)]
Merge "Remove unused BTM_SEC and BTU_HH defines"

4 years agoRemove unused BTM_SEC and BTU_HH defines
Hansong Zhang [Fri, 3 Jan 2020 22:18:47 +0000 (14:18 -0800)]
Remove unused BTM_SEC and BTU_HH defines

Test: compile
Change-Id: I74c89e83b4476c55eaac361b101435512f15ba01

4 years agoFix L2CAP cert and remove legacy HCI cert
Hansong Zhang [Tue, 7 Jan 2020 00:21:51 +0000 (16:21 -0800)]
Fix L2CAP cert and remove legacy HCI cert

Test: run_cert.sh
Change-Id: I792ece4a241b4733c3a4e496f8deb20e2096a109

4 years agoMerge "Replace source files with static library" am: 5025102343 am: 513fd421f9
Automerger Merge Worker [Wed, 8 Jan 2020 19:07:13 +0000 (19:07 +0000)]
Merge "Replace source files with static library" am: 5025102343 am: 513fd421f9

Change-Id: Icfed328829bb9c31cf432bacbd2e6874f735d0fa

4 years agoMerge "Remove 1:1 mandate for psm:channel" am: 3c2b307600 am: b005c20dc4
Automerger Merge Worker [Wed, 8 Jan 2020 19:06:48 +0000 (19:06 +0000)]
Merge "Remove 1:1 mandate for psm:channel" am: 3c2b307600 am: b005c20dc4

Change-Id: I674ccdc262faa6f2145a3c609416a68337dc5958

4 years agoMerge "Replace source files with static library"
Chris Manton [Wed, 8 Jan 2020 18:52:45 +0000 (10:52 -0800)]
Merge "Replace source files with static library"
am: 5025102343

Change-Id: I9c017433b7a0929879db3b8d59a509714323b99f

4 years agoMerge "Remove 1:1 mandate for psm:channel"
Chris Manton [Wed, 8 Jan 2020 18:52:21 +0000 (10:52 -0800)]
Merge "Remove 1:1 mandate for psm:channel"
am: 3c2b307600

Change-Id: I58cc94880211924b43cc52b519747be72e6a77e3

4 years agoMerge "Replace source files with static library"
Treehugger Robot [Wed, 8 Jan 2020 18:50:56 +0000 (18:50 +0000)]
Merge "Replace source files with static library"

4 years agoMerge "Remove 1:1 mandate for psm:channel"
Treehugger Robot [Wed, 8 Jan 2020 18:49:36 +0000 (18:49 +0000)]
Merge "Remove 1:1 mandate for psm:channel"

4 years agoDO NOT MERGE - Merge January 2020 Security Release into master am: 9ba8138dcb am...
Automerger Merge Worker [Wed, 8 Jan 2020 18:08:50 +0000 (18:08 +0000)]
DO NOT MERGE - Merge January 2020 Security Release into master am: 9ba8138dcb am: cd80c6898c

Change-Id: I56f1616619d6f09a7c55bb379c18fefd33950a3f

4 years agoDO NOT MERGE - Merge January 2020 Security Release into master
Xin Li [Wed, 8 Jan 2020 17:47:18 +0000 (09:47 -0800)]
DO NOT MERGE - Merge January 2020 Security Release into master
am: 9ba8138dcb

Change-Id: Ia8b22c13b34d0d80aa942b39f722db7af559f2ac

4 years agoRemove 1:1 mandate for psm:channel
Chris Manton [Wed, 8 Jan 2020 05:12:40 +0000 (21:12 -0800)]
Remove 1:1 mandate for psm:channel

PSMs may have multiple channels open.

Bug: 147316415
Test: Run 2 concurrent SDP queries
Change-Id: I9a87d24a21889f39b377297ae0c33ae8f1c6bed2

4 years agoDO NOT MERGE - Merge January 2020 Security Release into master
Xin Li [Tue, 7 Jan 2020 23:25:25 +0000 (15:25 -0800)]
DO NOT MERGE - Merge January 2020 Security Release into master

Bug: 147314974
Change-Id: I0feed5aa585da1bb404f6c5f6abdab29a5711ba6

4 years agoReplace source files with static library
Chris Manton [Tue, 7 Jan 2020 22:05:36 +0000 (14:05 -0800)]
Replace source files with static library

Bug: 147316415
Test: Passes presubmit tests

Change-Id: I1a318a476f80f3cc372d30274ab86971418a9793

4 years agoMerge "Add setConnectionPolicy to IBluetoothPbap.aidl" am: c999e08380 am: 7f70dc6b16
Automerger Merge Worker [Tue, 7 Jan 2020 21:13:31 +0000 (21:13 +0000)]
Merge "Add setConnectionPolicy to IBluetoothPbap.aidl" am: c999e08380 am: 7f70dc6b16

Change-Id: Ibfead06aa2d32dd47c8edeebae6b474724fdfa13

4 years agoMerge "Add setConnectionPolicy to IBluetoothPbap.aidl"
Rahul Sabnis [Tue, 7 Jan 2020 20:56:31 +0000 (12:56 -0800)]
Merge "Add setConnectionPolicy to IBluetoothPbap.aidl"
am: c999e08380

Change-Id: I69e776c58e33124e36b022370a9c82277c8760f7

4 years agoMerge "HCI: Add LE Scanning Manager test" am: d12ccf83b6 am: 5516cbe107
Automerger Merge Worker [Tue, 7 Jan 2020 20:37:41 +0000 (20:37 +0000)]
Merge "HCI: Add LE Scanning Manager test" am: d12ccf83b6 am: 5516cbe107

Change-Id: I2be096751f72a809a6a70731d86775d3c67e5891

4 years agoMerge "Add setConnectionPolicy to IBluetoothPbap.aidl"
Treehugger Robot [Tue, 7 Jan 2020 20:33:21 +0000 (20:33 +0000)]
Merge "Add setConnectionPolicy to IBluetoothPbap.aidl"

4 years agoMerge "HCI: Add LE Scanning Manager test"
Myles Watson [Tue, 7 Jan 2020 20:21:54 +0000 (12:21 -0800)]
Merge "HCI: Add LE Scanning Manager test"
am: d12ccf83b6

Change-Id: I3cf20dfc3152fd8058c23ae7409bc7ed36100194

4 years agoMerge "HCI: Add LE Scanning Manager test"
Treehugger Robot [Tue, 7 Jan 2020 19:05:59 +0000 (19:05 +0000)]
Merge "HCI: Add LE Scanning Manager test"

4 years agoOnly include common.proto when used am: 6e648ddd5f am: f37d36908b
Automerger Merge Worker [Tue, 7 Jan 2020 18:08:23 +0000 (18:08 +0000)]
Only include common.proto when used am: 6e648ddd5f am: f37d36908b

Change-Id: I417ec386b393af088b96cb7f6a2063ce34dc3a2d

4 years agoOnly include common.proto when used
Myles Watson [Tue, 7 Jan 2020 17:59:08 +0000 (09:59 -0800)]
Only include common.proto when used
am: 6e648ddd5f

Change-Id: I4ab7f755604d99fdd66bf3cedc9344c167ee61f0

4 years agoOnly include common.proto when used
Myles Watson [Mon, 6 Jan 2020 23:00:53 +0000 (15:00 -0800)]
Only include common.proto when used

Test: ./cert/run_cert_facade_only.sh
Change-Id: I11aed3d8ccb021990ada1e60ec82bb294e7fb72c

4 years agoMerge BTM_SecBond and BTM_SecBondByTransport am: 948aeebcbf am: 889fde18e0
Automerger Merge Worker [Tue, 7 Jan 2020 16:26:30 +0000 (16:26 +0000)]
Merge BTM_SecBond and BTM_SecBondByTransport am: 948aeebcbf am: 889fde18e0

Change-Id: I9ae879af7378e7c3e1cf4f21a492bfc7568aea55

4 years agoMerge BTM_SecBond and BTM_SecBondByTransport
Jakub Pawlowski [Tue, 7 Jan 2020 16:09:57 +0000 (08:09 -0800)]
Merge BTM_SecBond and BTM_SecBondByTransport
am: 948aeebcbf

Change-Id: I7c960c939944d06dc74391862438954ab157aea9

4 years agoMerge BTM_SecBond and BTM_SecBondByTransport
Jakub Pawlowski [Tue, 7 Jan 2020 12:47:55 +0000 (13:47 +0100)]
Merge BTM_SecBond and BTM_SecBondByTransport

This makes the API surface smaller, and code paths easier to follow.

Bug: 147086339
Change-Id: Ia24771d73792bd352678d41550608f805f27062c

4 years agoMerge "Add explicit legacy module path" am: 87f65e1899 am: ffb2958465
Automerger Merge Worker [Tue, 7 Jan 2020 01:56:06 +0000 (01:56 +0000)]
Merge "Add explicit legacy module path" am: 87f65e1899 am: ffb2958465

Change-Id: Ifd26b99d01baad352551b61a99ca46faff17a5ce

4 years agoAdd runtime sanity checks am: 1e40652f53 am: 85ff38d0ec
Automerger Merge Worker [Tue, 7 Jan 2020 01:55:30 +0000 (01:55 +0000)]
Add runtime sanity checks am: 1e40652f53 am: 85ff38d0ec

Change-Id: I2427f1eb3b76941762cce158bebf7eeb71696ae0

4 years agoMerge "Add explicit legacy module path"
Chris Manton [Tue, 7 Jan 2020 01:42:40 +0000 (17:42 -0800)]
Merge "Add explicit legacy module path"
am: 87f65e1899

Change-Id: Iccbe33a95891b09bd232942e8c98f9a124d9cad9

4 years agoAdd runtime sanity checks
Chris Manton [Tue, 7 Jan 2020 01:42:14 +0000 (17:42 -0800)]
Add runtime sanity checks
am: 1e40652f53

Change-Id: I9fd43669310aab366d599e149dded2fcf35a0a5f

4 years agoMerge "Add explicit legacy module path"
Treehugger Robot [Tue, 7 Jan 2020 01:37:05 +0000 (01:37 +0000)]
Merge "Add explicit legacy module path"

4 years agoHCI: Add LE Scanning Manager test
Myles Watson [Mon, 6 Jan 2020 22:44:11 +0000 (14:44 -0800)]
HCI: Add LE Scanning Manager test

Bug: 143569719
Test: ./cert/run_cert_facade_only.sh
Change-Id: I7d7c9837f4af765b0fa1680bc90903df54e6ad83

4 years agoAdd explicit legacy module path
Chris Manton [Mon, 6 Jan 2020 23:20:21 +0000 (15:20 -0800)]
Add explicit legacy module path

The module.h file is ambiguous without an explicit
path for legacy or gd include.

Bug: 146086425
Test: Builds and enables on crosshatch
Change-Id: I1b25ba4ffcd0a9177181d4ce2bb47bc06a930d9d

4 years agoAdd runtime sanity checks
Chris Manton [Mon, 6 Jan 2020 23:17:17 +0000 (15:17 -0800)]
Add runtime sanity checks

Bug: 146086425
Test: Manually boots
Change-Id: I17e10a2c7fa9646b2a727da726ed3757d42439e3

4 years agoAdd setConnectionPolicy to IBluetoothPbap.aidl
Rahul Sabnis [Mon, 6 Jan 2020 23:20:12 +0000 (15:20 -0800)]
Add setConnectionPolicy to IBluetoothPbap.aidl

Bug: 145943634
Test: Manual
Change-Id: Idfae61d09c5338ee3de362aeb3a2bbae68818eb4

4 years agoMerge "Implement Classic scanning facade" am: 10c45fdcc1 am: 974d7fef44
Automerger Merge Worker [Mon, 6 Jan 2020 23:14:13 +0000 (23:14 +0000)]
Merge "Implement Classic scanning facade" am: 10c45fdcc1 am: 974d7fef44

Change-Id: I04250ad68b7c18babd4d2f57e50ee31dc4f5f49d

4 years agoMerge "Implement Classic scanning facade"
Myles Watson [Mon, 6 Jan 2020 22:59:24 +0000 (14:59 -0800)]
Merge "Implement Classic scanning facade"
am: 10c45fdcc1

Change-Id: I5382e0c78623664d956beb1e91137238f215642e

4 years agoMerge "Implement Classic scanning facade"
Treehugger Robot [Mon, 6 Jan 2020 22:54:07 +0000 (22:54 +0000)]
Merge "Implement Classic scanning facade"

4 years agoMerge "Synchronize l2cap channel for client apps" am: e5af90bce5 am: 0a2f0043a8
Automerger Merge Worker [Mon, 6 Jan 2020 21:29:07 +0000 (21:29 +0000)]
Merge "Synchronize l2cap channel for client apps" am: e5af90bce5 am: 0a2f0043a8

Change-Id: I4e34f9868e4f8412ef48fe7377f67756fc491574

4 years agoMerge "Add shim for Security CreateBond method" am: cb5a724f66 am: 0ee10f557a
Automerger Merge Worker [Mon, 6 Jan 2020 21:28:46 +0000 (21:28 +0000)]
Merge "Add shim for Security CreateBond method" am: cb5a724f66 am: 0ee10f557a

Change-Id: Id7262ca13026fe14fbcf508ce387b3065039ca7c

4 years agoMerge "HCI: Start facade directory for testing" am: 964751442e am: 349d142f37
Automerger Merge Worker [Mon, 6 Jan 2020 21:28:23 +0000 (21:28 +0000)]
Merge "HCI: Start facade directory for testing" am: 964751442e am: 349d142f37

Change-Id: I1f39cec1fa8b500bcaec0df90342ca71e33581d9

4 years agoMerge "Uncomment HID cache logic" am: d86f23d170 am: dd06c5052a
Automerger Merge Worker [Mon, 6 Jan 2020 21:27:45 +0000 (21:27 +0000)]
Merge "Uncomment HID cache logic" am: d86f23d170 am: dd06c5052a

Change-Id: Id4eb3577ea012afb3cef5ce6724f910ad7df1280

4 years agoMerge "Synchronize l2cap channel for client apps"
Chris Manton [Mon, 6 Jan 2020 21:19:36 +0000 (13:19 -0800)]
Merge "Synchronize l2cap channel for client apps"
am: e5af90bce5

Change-Id: I760e8dbba7c26461c17810b6df16b4a473c2a287

4 years agoMerge "Add shim for Security CreateBond method"
Jakub Pawlowski [Mon, 6 Jan 2020 21:11:12 +0000 (13:11 -0800)]
Merge "Add shim for Security CreateBond method"
am: cb5a724f66

Change-Id: I9d096870e11f82b5cc97ba288cfb3ed7f05d83c2

4 years agoMerge "HCI: Start facade directory for testing"
Myles Watson [Mon, 6 Jan 2020 21:10:48 +0000 (13:10 -0800)]
Merge "HCI: Start facade directory for testing"
am: 964751442e

Change-Id: I557fee12a4ae696079950af8dfeac1af51dad6aa

4 years agoMerge "Uncomment HID cache logic"
Andre Eisenbach [Mon, 6 Jan 2020 21:08:22 +0000 (13:08 -0800)]
Merge "Uncomment HID cache logic"
am: d86f23d170

Change-Id: Ief49cf41829642be24bd72bffe5c5bf6bb0d437b

4 years agoMerge "Synchronize l2cap channel for client apps"
Treehugger Robot [Mon, 6 Jan 2020 20:45:06 +0000 (20:45 +0000)]
Merge "Synchronize l2cap channel for client apps"

4 years agoMerge "Add shim for Security CreateBond method"
Jakub Pawlowski [Mon, 6 Jan 2020 20:11:49 +0000 (20:11 +0000)]
Merge "Add shim for Security CreateBond method"

4 years agoMerge "HCI: Start facade directory for testing"
Treehugger Robot [Mon, 6 Jan 2020 19:40:35 +0000 (19:40 +0000)]
Merge "HCI: Start facade directory for testing"

4 years agoMerge "Uncomment HID cache logic"
Andre Eisenbach [Mon, 6 Jan 2020 19:34:37 +0000 (19:34 +0000)]
Merge "Uncomment HID cache logic"

4 years agoSynchronize l2cap channel for client apps
Chris Manton [Thu, 19 Dec 2019 00:58:58 +0000 (16:58 -0800)]
Synchronize l2cap channel for client apps

Respond immediately with a connection interface
descriptor rather than wait for the actual
connection in order to avoid a race.

Bug: 146565627
Test: CtsVerifier insecure connections

Change-Id: Ie6eeda50a01ee7fda076330d5583b9793578b1bb

4 years agoImplement Classic scanning facade
Myles Watson [Fri, 3 Jan 2020 23:20:33 +0000 (15:20 -0800)]
Implement Classic scanning facade

Bug: 143568835
Test: Neighbor module tests
Change-Id: Ibb479bceba349bd1fc230fb3d95f16a86d098ff4

4 years agoHCI: Start facade directory for testing
Myles Watson [Wed, 18 Dec 2019 23:47:38 +0000 (15:47 -0800)]
HCI: Start facade directory for testing

Create new tests that depend on the HciLayer.  Other interfaces
deserve their own facades.

Bug: 143568835
Test: ./cert/run_cert_facade_only.sh
Change-Id: Ia6bf16a42450a457c5d7ea3430a6d300f113a2b8

4 years agoAdd shim for Security CreateBond method
Jakub Pawlowski [Thu, 2 Jan 2020 14:01:16 +0000 (15:01 +0100)]
Add shim for Security CreateBond method

This allow for manual testing of GD implementation with real devices

Bug: 147086339
Change-Id: I196f71f15b828f89a221bca1658136593a31e561

4 years agoMerge "CERT: Wait for second event in assert_event_occurs" am: a3002c1a4d am: 119e3e3a8a
Automerger Merge Worker [Sat, 4 Jan 2020 03:17:43 +0000 (03:17 +0000)]
Merge "CERT: Wait for second event in assert_event_occurs" am: a3002c1a4d am: 119e3e3a8a

Change-Id: I306be205e7b8423bd74d58b85b8144699294ed0a

4 years agoMerge "CERT: Wait for second event in assert_event_occurs"
Myles Watson [Sat, 4 Jan 2020 03:05:14 +0000 (19:05 -0800)]
Merge "CERT: Wait for second event in assert_event_occurs"
am: a3002c1a4d

Change-Id: I74a74aa12fff00be17b479fc4f8525380c26f5e4

4 years agoMerge "CERT: Wait for second event in assert_event_occurs"
Treehugger Robot [Sat, 4 Jan 2020 02:42:31 +0000 (02:42 +0000)]
Merge "CERT: Wait for second event in assert_event_occurs"

4 years agoMerge "L2CAP facade depends on HciLayer" am: 71d74584d6 am: 39721c1b7f
Automerger Merge Worker [Sat, 4 Jan 2020 02:20:32 +0000 (02:20 +0000)]
Merge "L2CAP facade depends on HciLayer" am: 71d74584d6 am: 39721c1b7f

Change-Id: I98a0c4c76652b89e15df61edd2dce38d85cb30ac

4 years agoRootCanal: Implement Read Inquiry and Page params am: b9e37feeee am: 91b7d9d4ad
Automerger Merge Worker [Sat, 4 Jan 2020 02:19:57 +0000 (02:19 +0000)]
RootCanal: Implement Read Inquiry and Page params am: b9e37feeee am: 91b7d9d4ad

Change-Id: Ief1b096e867415369a7e9506316052b3fc66fe68

4 years agoMerge "L2CAP facade depends on HciLayer"
Myles Watson [Sat, 4 Jan 2020 02:05:42 +0000 (18:05 -0800)]
Merge "L2CAP facade depends on HciLayer"
am: 71d74584d6

Change-Id: I7fcff09bcb5bb6496456146485c159c6521ebee3

4 years agoRootCanal: Implement Read Inquiry and Page params
Myles Watson [Sat, 4 Jan 2020 02:05:15 +0000 (18:05 -0800)]
RootCanal: Implement Read Inquiry and Page params
am: b9e37feeee

Change-Id: Ib2a61b4ef494d2fbee6bfffa35cf2965c71e4af2

4 years agoMerge "L2CAP facade depends on HciLayer"
Treehugger Robot [Sat, 4 Jan 2020 01:57:40 +0000 (01:57 +0000)]
Merge "L2CAP facade depends on HciLayer"

4 years agoCERT: Wait for second event in assert_event_occurs
Myles Watson [Sat, 4 Jan 2020 00:32:27 +0000 (16:32 -0800)]
CERT: Wait for second event in assert_event_occurs

Test: ./cert/run_cert_facade_only.sh
Change-Id: Icf6388116c7e7aad138678198bec32b8847200bf

4 years agoL2CAP facade depends on HciLayer
Myles Watson [Mon, 23 Dec 2019 22:33:34 +0000 (14:33 -0800)]
L2CAP facade depends on HciLayer

Bug: 143568835
Test: ./cert/run_cert.sh
Change-Id: I0dec5b327ac6bf4adb66c760c3a98166de428737

4 years agoRootCanal: Implement Read Inquiry and Page params
Myles Watson [Fri, 3 Jan 2020 23:34:46 +0000 (15:34 -0800)]
RootCanal: Implement Read Inquiry and Page params

Bug: 143568835
Test: start neighbor module with RootCanal
Change-Id: I1c6790119249234b4e41d5c136cfd7d737608543

4 years agoMerge "DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master" into stage-aosp...
Automerger Merge Worker [Fri, 3 Jan 2020 18:08:54 +0000 (18:08 +0000)]
Merge "DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master" into stage-aosp-master am: 9c21d74309

Change-Id: Ib5b53e262330eac887b44517761c43ce56d889f6

4 years agoDO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master am: e8b54d9168
Automerger Merge Worker [Fri, 3 Jan 2020 18:06:48 +0000 (18:06 +0000)]
DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master am: e8b54d9168

Change-Id: I89179081eec8bcd42f94cdf288c4b7151b470c90

4 years agoMerge "DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master" into stage-aosp...
TreeHugger Robot [Fri, 3 Jan 2020 17:50:03 +0000 (17:50 +0000)]
Merge "DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master" into stage-aosp-master

4 years agoMerge "Cert: Add tests for event_asserts" am: 4edca2dbae am: 3aa89e8142
Automerger Merge Worker [Thu, 2 Jan 2020 23:03:04 +0000 (23:03 +0000)]
Merge "Cert: Add tests for event_asserts" am: 4edca2dbae am: 3aa89e8142

Change-Id: Ifd6e84a6eb989c5b6b1fe6d0bb63e1c91a9684c6

4 years agoMerge "Cert: Add tests for event_asserts"
Myles Watson [Thu, 2 Jan 2020 22:47:50 +0000 (14:47 -0800)]
Merge "Cert: Add tests for event_asserts"
am: 4edca2dbae

Change-Id: I8d49f3ac231f746f9d9e675d6e9766cefdc1086b

4 years agoMerge "Cert: Add tests for event_asserts"
Treehugger Robot [Thu, 2 Jan 2020 22:12:40 +0000 (22:12 +0000)]
Merge "Cert: Add tests for event_asserts"

4 years agoDO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master
Xin Li [Thu, 2 Jan 2020 21:29:53 +0000 (13:29 -0800)]
DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master

Change-Id: I8e975eb4b719bbc3836b2ff58c80105b17ee5200

4 years agoMerge "Remove unused BluetoothHearingAid methods from aidl" am: e9177eb314 am: 1e12abee47
Automerger Merge Worker [Thu, 2 Jan 2020 21:17:38 +0000 (21:17 +0000)]
Merge "Remove unused BluetoothHearingAid methods from aidl" am: e9177eb314 am: 1e12abee47

Change-Id: Ibba6982b8a9b53c53ce3d11cf6c3cc26fff7a37b

4 years agoMerge "Remove unused BluetoothHearingAid methods from aidl"
Rahul Sabnis [Thu, 2 Jan 2020 21:01:49 +0000 (13:01 -0800)]
Merge "Remove unused BluetoothHearingAid methods from aidl"
am: e9177eb314

Change-Id: Ia0488b2facbd9e0db52d7f046237f4c946fb317e

4 years agoMerge "Remove unused BluetoothHearingAid methods from aidl"
Treehugger Robot [Thu, 2 Jan 2020 20:43:57 +0000 (20:43 +0000)]
Merge "Remove unused BluetoothHearingAid methods from aidl"

4 years agoMerge "BTM: Remove dead code" am: 2ee4021bd4 am: e89ebd85a2
Automerger Merge Worker [Thu, 2 Jan 2020 20:17:55 +0000 (20:17 +0000)]
Merge "BTM: Remove dead code" am: 2ee4021bd4 am: e89ebd85a2

Change-Id: I846becd6e1f2c4bb8af1c3cae7843034963b5205

4 years agoMerge "BTM: Remove dead code"
Hansong Zhang [Thu, 2 Jan 2020 19:43:01 +0000 (11:43 -0800)]
Merge "BTM: Remove dead code"
am: 2ee4021bd4

Change-Id: I8621b6e9ed4ebf88709785839e4a467c74116f4b

4 years agoMerge "BTM: Remove dead code"
Treehugger Robot [Thu, 2 Jan 2020 19:40:46 +0000 (19:40 +0000)]
Merge "BTM: Remove dead code"

4 years agoMerge "Use LoadHookContext instead of the deprecated BaseContext" am: b67e9ec679...
Automerger Merge Worker [Thu, 2 Jan 2020 19:24:00 +0000 (19:24 +0000)]
Merge "Use LoadHookContext instead of the deprecated BaseContext" am: b67e9ec679 am: b893079843

Change-Id: I5e8c0d317fae390370640bda4e4e7fb71e6925ae

4 years agoMerge "Use LoadHookContext instead of the deprecated BaseContext"
Colin Cross [Thu, 2 Jan 2020 19:19:44 +0000 (11:19 -0800)]
Merge "Use LoadHookContext instead of the deprecated BaseContext"
am: b67e9ec679

Change-Id: Iac099445675812c4b706f9fb2827c4848e54c1ff

4 years agoMerge "BluetoothAudioHAL: Supports the A2dpSuspended parameter" am: 2785987caa am...
Automerger Merge Worker [Thu, 2 Jan 2020 19:18:57 +0000 (19:18 +0000)]
Merge "BluetoothAudioHAL: Supports the A2dpSuspended parameter" am: 2785987caa am: e31e35dcea

Change-Id: Ib8d9347bafa493af594e604a4d3e3d74739952ed

4 years agoMerge "A2DP: Clear local pending flags while AV is stable" am: 36856c96cd am: 9f0e53d6be
Automerger Merge Worker [Thu, 2 Jan 2020 19:18:48 +0000 (19:18 +0000)]
Merge "A2DP: Clear local pending flags while AV is stable" am: 36856c96cd am: 9f0e53d6be

Change-Id: I99e1e1b58eabf7773cdfd7e566ffcc6d9dccf1dc

4 years agoMerge "A2DP: Reply AVDT_StartReq failure to upper-layer" am: 34d6a9c81d am: cc6eb411ba
Automerger Merge Worker [Thu, 2 Jan 2020 19:18:39 +0000 (19:18 +0000)]
Merge "A2DP: Reply AVDT_StartReq failure to upper-layer" am: 34d6a9c81d am: cc6eb411ba

Change-Id: Id25155e4433b86e2864fe1c3e0a91e24e557848d

4 years agoMerge "Use LoadHookContext instead of the deprecated BaseContext"
Treehugger Robot [Thu, 2 Jan 2020 19:11:35 +0000 (19:11 +0000)]
Merge "Use LoadHookContext instead of the deprecated BaseContext"

4 years agoMerge "BluetoothAudioHAL: Supports the A2dpSuspended parameter"
Cheney Ni [Thu, 2 Jan 2020 19:03:48 +0000 (11:03 -0800)]
Merge "BluetoothAudioHAL: Supports the A2dpSuspended parameter"
am: 2785987caa

Change-Id: Icbfe1b062028285a99e7af3c9ad830ecbafd23f3

4 years agoMerge "A2DP: Clear local pending flags while AV is stable"
Cheney Ni [Thu, 2 Jan 2020 19:01:27 +0000 (11:01 -0800)]
Merge "A2DP: Clear local pending flags while AV is stable"
am: 36856c96cd

Change-Id: Idd0757605ff182e0e6cc7db64b616a683f5d2f45

4 years agoMerge "A2DP: Reply AVDT_StartReq failure to upper-layer"
Cheney Ni [Thu, 2 Jan 2020 19:00:50 +0000 (11:00 -0800)]
Merge "A2DP: Reply AVDT_StartReq failure to upper-layer"
am: 34d6a9c81d

Change-Id: I465f4a5b2e7f5bca2c748ae9d779910d5311c711

4 years agoMerge "BluetoothAudioHAL: Supports the A2dpSuspended parameter"
Treehugger Robot [Thu, 2 Jan 2020 18:58:34 +0000 (18:58 +0000)]
Merge "BluetoothAudioHAL: Supports the A2dpSuspended parameter"

4 years agoMerge "A2DP: Clear local pending flags while AV is stable"
Treehugger Robot [Thu, 2 Jan 2020 18:50:41 +0000 (18:50 +0000)]
Merge "A2DP: Clear local pending flags while AV is stable"

4 years agoMerge "A2DP: Reply AVDT_StartReq failure to upper-layer"
Treehugger Robot [Thu, 2 Jan 2020 18:47:25 +0000 (18:47 +0000)]
Merge "A2DP: Reply AVDT_StartReq failure to upper-layer"

4 years agoCert: Add tests for event_asserts
Myles Watson [Thu, 2 Jan 2020 18:01:27 +0000 (10:01 -0800)]
Cert: Add tests for event_asserts

Bug: 143568835
Test: ./cert/run_cert_facade_only.sh
Change-Id: I006efa1e276ac3ae839fd0305686de605b52044d

4 years agoA2DP: Clear local pending flags while AV is stable
Cheney Ni [Thu, 2 Jan 2020 02:44:06 +0000 (10:44 +0800)]
A2DP: Clear local pending flags while AV is stable

There was a timing issue that the local pending state was cleared, AV
state was transitioning from started to opened, and was still saw as
started before entered the opened state. This caused a mismatched
between Bluetooth stack and audio HAL, and since we would clear those
local pending flags while entring opened state, it was redundant to
clear the state before the transition.

Bug: 140609685
Test: A2DP playback manually
Change-Id: Ie60bc9c432faa5038340f57da18282255ea5c7c4

4 years agoUse LoadHookContext instead of the deprecated BaseContext
Colin Cross [Mon, 30 Dec 2019 23:50:46 +0000 (15:50 -0800)]
Use LoadHookContext instead of the deprecated BaseContext

Test: m checkbuild
Change-Id: I21076e0f2070c5085e008af796c1851289e9192c

4 years agoBTM: Remove dead code
Hansong Zhang [Sat, 21 Dec 2019 00:24:38 +0000 (16:24 -0800)]
BTM: Remove dead code

Test: compile
Change-Id: I18b48347656a1b93ce8103fffde527a6f0e4e1d1

4 years agoMerge changes from topic "A2DP_HAL_SWHW_SWITCH" am: be7a88318f am: 94d05b8501
Automerger Merge Worker [Mon, 30 Dec 2019 20:12:50 +0000 (20:12 +0000)]
Merge changes from topic "A2DP_HAL_SWHW_SWITCH" am: be7a88318f am: 94d05b8501

Change-Id: Id706ea9e8f042f39206b6bf9ac9e238ab88b8252