OSDN Git Service
Automerger Merge Worker [Thu, 16 Jan 2020 14:13:52 +0000 (14:13 +0000)]
Merge "Convert on-device tests to facade_only" am:
83646936f2 am:
ee484f364c
Change-Id: Id3c1df867d6d986666bfa869a27e17b4762d06ae
Automerger Merge Worker [Thu, 16 Jan 2020 14:13:28 +0000 (14:13 +0000)]
Merge "SecurityManager: Call Init in the constructor" am:
b09d920e59 am:
a92d9b2fb7
Change-Id: I46e5830946fe2f2bd7cd9cb7fe257593eb2de74a
Myles Watson [Thu, 16 Jan 2020 14:09:00 +0000 (06:09 -0800)]
Merge "Convert on-device tests to facade_only"
am:
83646936f2
Change-Id: Id54aafc0067615bfcc42ccbe0fcc4f71add7ad89
Treehugger Robot [Thu, 16 Jan 2020 14:07:39 +0000 (14:07 +0000)]
Merge "Convert on-device tests to facade_only"
Myles Watson [Thu, 16 Jan 2020 14:05:19 +0000 (06:05 -0800)]
Merge "SecurityManager: Call Init in the constructor"
am:
b09d920e59
Change-Id: I0121013ebe7c6421e2ff4e3d8748e26115284a94
Treehugger Robot [Thu, 16 Jan 2020 14:04:09 +0000 (14:04 +0000)]
Merge "SecurityManager: Call Init in the constructor"
Automerger Merge Worker [Thu, 16 Jan 2020 13:28:56 +0000 (13:28 +0000)]
Merge "HCI: Add an LeAclManagerFacade and tests" am:
fe6c2a924e am:
9e4a5413c7
Change-Id: Id5c92afbe7cbd015965a43a1bbe9b4d6b7668eb2
Myles Watson [Thu, 16 Jan 2020 13:19:26 +0000 (05:19 -0800)]
Merge "HCI: Add an LeAclManagerFacade and tests"
am:
fe6c2a924e
Change-Id: I420709274c0a322f9302f45e2b08e04b2b568a77
Treehugger Robot [Thu, 16 Jan 2020 13:06:08 +0000 (13:06 +0000)]
Merge "HCI: Add an LeAclManagerFacade and tests"
Automerger Merge Worker [Thu, 16 Jan 2020 07:12:20 +0000 (07:12 +0000)]
Merge "L2CAP: Call Authenticate for the Classic Pairing service" am:
e76ab3001f am:
7dba465507
Change-Id: I013bd4f29f4daa13a3ae24cd241d258cd97bab4d
Myles Watson [Thu, 16 Jan 2020 07:04:27 +0000 (23:04 -0800)]
Merge "L2CAP: Call Authenticate for the Classic Pairing service"
am:
e76ab3001f
Change-Id: Ie7b02675a039b5c74ce63b21bfe6b15b9bea7649
Treehugger Robot [Thu, 16 Jan 2020 06:14:49 +0000 (06:14 +0000)]
Merge "L2CAP: Call Authenticate for the Classic Pairing service"
Automerger Merge Worker [Thu, 16 Jan 2020 02:19:15 +0000 (02:19 +0000)]
Merge "Remove async grpc helper" am:
28aaf048ee am:
51d4f31234
Change-Id: I85d434e101f8426d7bc48f5895d2f52a2cf727d7
Hansong Zhang [Thu, 16 Jan 2020 02:06:34 +0000 (18:06 -0800)]
Merge "Remove async grpc helper"
am:
28aaf048ee
Change-Id: I11315e6be44dafc1d9065cec11099bcffb176ead
Treehugger Robot [Thu, 16 Jan 2020 02:05:23 +0000 (02:05 +0000)]
Merge "Remove async grpc helper"
Automerger Merge Worker [Thu, 16 Jan 2020 01:51:27 +0000 (01:51 +0000)]
Merge "Fix flaky gd unit tests" am:
5e50aea08e am:
770731db78
Change-Id: I5e53ad9372cf54de9ebbd8e27390d4480a95d229
Hansong Zhang [Thu, 16 Jan 2020 01:40:06 +0000 (17:40 -0800)]
Merge "Fix flaky gd unit tests"
am:
5e50aea08e
Change-Id: I18538e51b3853ebce03db08344333e8873bd18df
Treehugger Robot [Thu, 16 Jan 2020 01:36:22 +0000 (01:36 +0000)]
Merge "Fix flaky gd unit tests"
Automerger Merge Worker [Thu, 16 Jan 2020 01:14:29 +0000 (01:14 +0000)]
Merge "gd: Repair and clean up rfcomm client/server tests" am:
27bc74167e am:
052d5094da
Change-Id: I2a7bab5b2cbfb1e2c98564c918f519603261960c
Chris Manton [Thu, 16 Jan 2020 01:01:48 +0000 (17:01 -0800)]
Merge "gd: Repair and clean up rfcomm client/server tests"
am:
27bc74167e
Change-Id: I1e9063432a6419238cee0bc062c3979ea0cecfa9
Treehugger Robot [Thu, 16 Jan 2020 00:45:53 +0000 (00:45 +0000)]
Merge "gd: Repair and clean up rfcomm client/server tests"
Myles Watson [Wed, 15 Jan 2020 22:52:58 +0000 (14:52 -0800)]
Convert on-device tests to facade_only
Bug:
145832107
Test: ./cert/run_device_cert.sh
Change-Id: Ie66f87be313989ede7387aae9c3e7cce9edf3c6b
Myles Watson [Wed, 15 Jan 2020 23:29:27 +0000 (15:29 -0800)]
SecurityManager: Call Init in the constructor
Bug:
145638034
Test: SecurityManager facade tests in ./cert/run_tests_facade_only.sh
Change-Id: I5ac735aa35177aa2cf34e0842dd0fd2a95347b30
Myles Watson [Wed, 15 Jan 2020 23:28:16 +0000 (15:28 -0800)]
L2CAP: Call Authenticate for the Classic Pairing service
Bug:
145638034
Test: SecurityManager facade tests in ./cert/run_tests_facade_only.sh
Change-Id: Ib673e0c8355a0285785e88d887cfb85d73a09227
Automerger Merge Worker [Wed, 15 Jan 2020 23:22:28 +0000 (23:22 +0000)]
Initial entry for gd shim dumpsys support am:
0cb19c8cba am:
2718e69eb5
Change-Id: I34fdbffab946634b5440cfb8f922aa52c5fc6b4a
Hansong Zhang [Wed, 15 Jan 2020 23:05:29 +0000 (15:05 -0800)]
Remove async grpc helper
No longer used
Bug:
147765784
Test: run_cert.sh
Change-Id: Ib6b608e504c52ce44736f2b9f82f3cfc5fa6c520
Hansong Zhang [Tue, 14 Jan 2020 22:31:15 +0000 (14:31 -0800)]
Fix flaky gd unit tests
Test: $ANDROID_HOST_OUT/nativetest64/bluetooth_test_gd/bluetooth_test_gd
Bug:
147765784
Bug:
146363673
Bug:
146363318
Bug:
146363313
Change-Id: I382ccfd2b561c2154d2bef6c6b87db4e82ae7acb
Chris Manton [Wed, 15 Jan 2020 23:12:01 +0000 (15:12 -0800)]
Initial entry for gd shim dumpsys support
am:
0cb19c8cba
Change-Id: Iff00f91c64df2e458beae1a85183f2ab516115f2
Chris Manton [Tue, 14 Jan 2020 04:32:01 +0000 (20:32 -0800)]
gd: Repair and clean up rfcomm client/server tests
Bug:
144170448
Test: Run ctsverified for both client and server under Gd
Change-Id: Ia17eab4c4121fddf9bc9feb895d25566c765d17b
Chris Manton [Tue, 14 Jan 2020 05:11:48 +0000 (21:11 -0800)]
Initial entry for gd shim dumpsys support
Bug:
147672133
Test: Boot into gd and manually verify dumpsys
Change-Id: Ie588dc0e3a1fd4dfd31abec9f5a21cae87eb0c67
Automerger Merge Worker [Wed, 15 Jan 2020 16:43:06 +0000 (16:43 +0000)]
Merge changes Ib064f067,Iea33782b am:
ef2594ff01 am:
9f04fd43e7
Change-Id: I8c7791264b4f13187e0fbf0a0cb470107d9654af
Myles Watson [Wed, 15 Jan 2020 16:34:29 +0000 (08:34 -0800)]
Merge changes Ib064f067,Iea33782b
am:
ef2594ff01
Change-Id: If9bad394e679cb591419e8cbd410ede3fa047634
Myles Watson [Wed, 15 Jan 2020 16:33:28 +0000 (16:33 +0000)]
Merge changes Ib064f067,Iea33782b
* changes:
Revert "Add timer to detect HwBinder thread stuck"
Revert "Print HwBinder thread performance to dumpsys"
Automerger Merge Worker [Wed, 15 Jan 2020 07:30:37 +0000 (07:30 +0000)]
Merge "Use proper CID when registering for LE Signalling Channel" am:
ada37ec01f am:
7397069708
Change-Id: I66e7cfaee925f1f6072c4266f2a58f3016b3f01c
Jakub Pawlowski [Wed, 15 Jan 2020 07:15:21 +0000 (23:15 -0800)]
Merge "Use proper CID when registering for LE Signalling Channel"
am:
ada37ec01f
Change-Id: I8e37211309006eb0faeaa5d539512cfe4153b984
Ugo Yu [Wed, 15 Jan 2020 06:09:19 +0000 (14:09 +0800)]
Revert "Add timer to detect HwBinder thread stuck"
This reverts commit
6c9d9f527b7ec54bee5a569e3635800bbe7be3dd.
Bug:
146533770
Test: Build pass
Ugo Yu [Wed, 15 Jan 2020 05:56:57 +0000 (05:56 +0000)]
Revert "Print HwBinder thread performance to dumpsys"
This reverts commit
dff02c0428c8c32bf5c796c189fdc66ef34ee80d.
Bug:
146533770
Test: Build pass
Change-Id: Iea33782be366cb7317161b94140edb9f518b82f7
Jakub Pawlowski [Wed, 15 Jan 2020 07:03:58 +0000 (07:03 +0000)]
Merge "Use proper CID when registering for LE Signalling Channel"
Automerger Merge Worker [Wed, 15 Jan 2020 03:46:53 +0000 (03:46 +0000)]
Merge "Use BASIC rather than LE_CREDIT_BASED channel for LE Fixed channels" am:
0059c3358d am:
7b70d9b1a9
Change-Id: I0936495d53ccd451d35799b67569fcf6ab3dfef3
Jakub Pawlowski [Wed, 15 Jan 2020 03:36:13 +0000 (19:36 -0800)]
Merge "Use BASIC rather than LE_CREDIT_BASED channel for LE Fixed channels"
am:
0059c3358d
Change-Id: I8f977e16aef20f409810c8435f4fadd9a0375844
Treehugger Robot [Wed, 15 Jan 2020 03:34:40 +0000 (03:34 +0000)]
Merge "Use BASIC rather than LE_CREDIT_BASED channel for LE Fixed channels"
Jakub Pawlowski [Tue, 14 Jan 2020 23:40:18 +0000 (00:40 +0100)]
Use BASIC rather than LE_CREDIT_BASED channel for LE Fixed channels
Bug:
147086339
Test: Send data over SMP
Change-Id: I4d2253a193872235021b3af8488db70447e563eb
Jakub Pawlowski [Tue, 14 Jan 2020 16:04:40 +0000 (17:04 +0100)]
Use proper CID when registering for LE Signalling Channel
Currently stack crashes on first received packet on signalling channel
Test: manual test, establish LE Connection
Bug:
147086339
Change-Id: Iaf062acbe5c03c2def51df71a754572d95a6e9a3
Myles Watson [Tue, 14 Jan 2020 22:33:09 +0000 (14:33 -0800)]
HCI: Add an LeAclManagerFacade and tests
Bug:
145832107
Test: ./cert/run_cert_facade_only.sh
Change-Id: I99a3e713ebd98d29fa53e31fdabfd237b9428fa5
Automerger Merge Worker [Tue, 14 Jan 2020 03:02:52 +0000 (03:02 +0000)]
Merge "Only use gd storage if gd stack has been started up" am:
6479d7cb30 am:
749ecb23d2
Change-Id: I88d42bf8a531fe1bb8071b8ccf7c196635acac33
Chris Manton [Tue, 14 Jan 2020 02:50:44 +0000 (18:50 -0800)]
Merge "Only use gd storage if gd stack has been started up"
am:
6479d7cb30
Change-Id: Ie02b23152a2b7805dc0a6fe9f9bafc42e397b077
Treehugger Robot [Tue, 14 Jan 2020 02:46:43 +0000 (02:46 +0000)]
Merge "Only use gd storage if gd stack has been started up"
Chris Manton [Mon, 13 Jan 2020 23:44:15 +0000 (15:44 -0800)]
Only use gd storage if gd stack has been started up
Add flag to detect if gd stack has started up.
Upon init btif reads from config file:
1. Local adapter name
2. Discovery timeout
And writes:
1. LE keys (x4)
2. Scan default settings
3. Discovery timeout
Test: System boots without failure
Bug:
147315979
Change-Id: I52c24433bc49466bafcc948963041fcd098d9981
Automerger Merge Worker [Tue, 14 Jan 2020 00:04:06 +0000 (00:04 +0000)]
Merge "Fix Neighbor Test" am:
7ab110cf43 am:
644a1dcd26
Change-Id: I8cfc31ebe2b6683160e3c6358b509aa73d9c31c1
Hansong Zhang [Mon, 13 Jan 2020 23:48:05 +0000 (15:48 -0800)]
Merge "Fix Neighbor Test"
am:
7ab110cf43
Change-Id: I7e31eca3efbddbdc63de55fa26a891879fef44fc
Treehugger Robot [Mon, 13 Jan 2020 23:46:31 +0000 (23:46 +0000)]
Merge "Fix Neighbor Test"
Automerger Merge Worker [Mon, 13 Jan 2020 23:38:00 +0000 (23:38 +0000)]
Merge "Updates for bison 3.5" am:
990fecdccd am:
a9a462e3c4
Change-Id: I0eb8315089f47f2e0a34858ebbfda6385521711f
Dan Willemsen [Mon, 13 Jan 2020 23:22:24 +0000 (15:22 -0800)]
Merge "Updates for bison 3.5"
am:
990fecdccd
Change-Id: If80b6c67b20b62779eb364be2f7566c55e733a3f
Treehugger Robot [Mon, 13 Jan 2020 23:17:02 +0000 (23:17 +0000)]
Merge "Updates for bison 3.5"
Automerger Merge Worker [Mon, 13 Jan 2020 22:26:03 +0000 (22:26 +0000)]
Merge changes Ibedf4957,Ic3069c6d am:
186f34dc5e am:
09419c4ca8
Change-Id: I0b5e580f3c404f68b9beb3c7cba3f1d040b6d445
Hansong Zhang [Mon, 13 Jan 2020 22:10:21 +0000 (14:10 -0800)]
Merge changes Ibedf4957,Ic3069c6d
am:
186f34dc5e
Change-Id: I0a3be2d205f84fa4e566160b9542b7e9c80fa76b
Hansong Zhang [Mon, 13 Jan 2020 18:52:47 +0000 (10:52 -0800)]
Fix Neighbor Test
Test: cert/run_cert_facade_only.sh
Change-Id: I7a4f968790e1b9323938349ab59019757e943b7c
Treehugger Robot [Mon, 13 Jan 2020 22:03:32 +0000 (22:03 +0000)]
Merge changes Ibedf4957,Ic3069c6d
* changes:
L2CAP: Handle pending command response and fix response
L2CAP security policy definition
Automerger Merge Worker [Mon, 13 Jan 2020 18:42:28 +0000 (18:42 +0000)]
Merge changes Iaa097f78,Id3f6918e,I0ee70c56 am:
2b9497718b am:
2fd618ede2
Change-Id: Ia97dd0a5e407ab065c6116974661d3366dcc90a9
Hansong Zhang [Mon, 13 Jan 2020 17:47:05 +0000 (09:47 -0800)]
L2CAP: Handle pending command response and fix response
Test: run_cert.sh
Bug:
141555841
Change-Id: Ibedf49573d3787c9b96afd416977da9ef998fdeb
Chris Manton [Mon, 13 Jan 2020 18:32:36 +0000 (10:32 -0800)]
Merge changes Iaa097f78,Id3f6918e,I0ee70c56
am:
2b9497718b
Change-Id: Ia390af2c0478d4844c312d9b954647e25159489a
Treehugger Robot [Mon, 13 Jan 2020 18:30:25 +0000 (18:30 +0000)]
Merge changes Iaa097f78,Id3f6918e,I0ee70c56
* changes:
gd: Initial entry for main legacy storage shim
gd: Initial entry for legacy storage shim
gd: Initial entry for legacy config storage
Hansong Zhang [Mon, 13 Jan 2020 17:44:33 +0000 (09:44 -0800)]
L2CAP security policy definition
Bug:
141555841
Test: compile
Change-Id: Ic3069c6d919c81a36b4062f04b97126236adfa84
Chris Manton [Sat, 11 Jan 2020 05:18:38 +0000 (21:18 -0800)]
gd: Initial entry for main legacy storage shim
Bug:
147315979
Test: bluetooth_test_gd
Change-Id: Iaa097f78e5d9406b23acbc92bd122ad17904c1aa
Chris Manton [Sun, 12 Jan 2020 05:14:45 +0000 (21:14 -0800)]
gd: Initial entry for legacy storage shim
Bug:
147315979
Test: Compiles bluetooth_test_gd
Change-Id: Id3f6918e3216c30d214632a6a8bd36e7e8010f41
Chris Manton [Sat, 11 Jan 2020 05:17:47 +0000 (21:17 -0800)]
gd: Initial entry for legacy config storage
Bug:
147315979
Test: bluetooth_test_gd
Change-Id: I0ee70c5663796b418b5e99f78d8a2ded234d61fd
Automerger Merge Worker [Sat, 11 Jan 2020 11:24:55 +0000 (11:24 +0000)]
Merge "Add LeExtendedCreateConnection definition" am:
16ad82e7a4 am:
e5956f633e
Change-Id: I73359f1669088760b175b2ba257627975f3969c8
Jakub Pawlowski [Sat, 11 Jan 2020 11:09:51 +0000 (03:09 -0800)]
Merge "Add LeExtendedCreateConnection definition"
am:
16ad82e7a4
Change-Id: I2c4af9c458965f1997fd405e54bd51984aabcfbf
Treehugger Robot [Sat, 11 Jan 2020 11:08:06 +0000 (11:08 +0000)]
Merge "Add LeExtendedCreateConnection definition"
Automerger Merge Worker [Sat, 11 Jan 2020 07:23:26 +0000 (07:23 +0000)]
Cert: Enable page scans in tests am:
f4af167a6e am:
7b8ffbe515
Change-Id: I9add10cafa4e9ef200f3acd00634ee79bcdf3eaf
Myles Watson [Sat, 11 Jan 2020 07:05:30 +0000 (23:05 -0800)]
Cert: Enable page scans in tests
am:
f4af167a6e
Change-Id: I62faa8d26ca1a0e54c4d5f6e7a634ae51f2dbad0
Jakub Pawlowski [Fri, 10 Jan 2020 14:06:58 +0000 (15:06 +0100)]
Add LeExtendedCreateConnection definition
Test: bluetooth_test_gd
Bug:
147086339
Change-Id: I9db04b79e870f9b16567b1b2b1246ea130e0f68f
Myles Watson [Fri, 10 Jan 2020 17:46:56 +0000 (09:46 -0800)]
Cert: Enable page scans in tests
Bug:
147444951
Test: ./cert/run_cert.sh
Change-Id: I989fb8741f98e0d7c6e3ccc7de2e7aa387a4f6b3
Automerger Merge Worker [Fri, 10 Jan 2020 20:35:17 +0000 (20:35 +0000)]
Merge "Add setConnectionPolicy to HidDevice and Pan aidl" am:
c475488f22 am:
11160f6e93
Change-Id: I402467fdaa90c6402a2f531ec457b7c098c4733b
Rahul Sabnis [Fri, 10 Jan 2020 20:24:52 +0000 (12:24 -0800)]
Merge "Add setConnectionPolicy to HidDevice and Pan aidl"
am:
c475488f22
Change-Id: I142493b51e0b8a2f516bc39a8b7b5845f63f76b6
Treehugger Robot [Fri, 10 Jan 2020 20:19:36 +0000 (20:19 +0000)]
Merge "Add setConnectionPolicy to HidDevice and Pan aidl"
Automerger Merge Worker [Fri, 10 Jan 2020 20:16:56 +0000 (20:16 +0000)]
Merge changes I06aadb55,I2c5b2bdc am:
bdf11eb2c5 am:
14dd9efb2b
Change-Id: Ice44845b098bd6842935518f93451e8b9de6c1b5
Automerger Merge Worker [Fri, 10 Jan 2020 20:16:41 +0000 (20:16 +0000)]
Merge "Direct HCI classic connection test" am:
118afb3e81 am:
4a733574ce
Change-Id: Id697edac38f36218474ebd95b5612fbc560d2cd0
Myles Watson [Fri, 10 Jan 2020 20:12:14 +0000 (12:12 -0800)]
Merge changes I06aadb55,I2c5b2bdc
am:
bdf11eb2c5
Change-Id: Idc25e97894bcfb600e3e4810e284ea93172f0d9b
Treehugger Robot [Fri, 10 Jan 2020 20:09:43 +0000 (20:09 +0000)]
Merge changes I06aadb55,I2c5b2bdc
* changes:
AclManagerFacade
HCI Controller tests
Myles Watson [Fri, 10 Jan 2020 20:05:17 +0000 (12:05 -0800)]
Merge "Direct HCI classic connection test"
am:
118afb3e81
Change-Id: Iad986e3dd3f22bdd05c25fdd8c24f363afaa8e6f
Treehugger Robot [Fri, 10 Jan 2020 20:02:34 +0000 (20:02 +0000)]
Merge "Direct HCI classic connection test"
Automerger Merge Worker [Fri, 10 Jan 2020 18:27:18 +0000 (18:27 +0000)]
Merge "A2DP: Reset the HAL pending command flag while clean up" am:
323b38e43e am:
c230e7fad6
Change-Id: I82c8f2b34ba104accaa63d6433438316a42fed90
Cheney Ni [Fri, 10 Jan 2020 18:15:47 +0000 (10:15 -0800)]
Merge "A2DP: Reset the HAL pending command flag while clean up"
am:
323b38e43e
Change-Id: I4089ff2568d472e54bcb01a8fcf01cb8a5d36e49
Treehugger Robot [Fri, 10 Jan 2020 18:13:33 +0000 (18:13 +0000)]
Merge "A2DP: Reset the HAL pending command flag while clean up"
Myles Watson [Wed, 8 Jan 2020 19:19:00 +0000 (11:19 -0800)]
AclManagerFacade
Bug:
147444951
Test: ./cert/run_cert_facade_only.sh
Change-Id: I06aadb556df5d5c73644b0987d459557deb9aeeb
Myles Watson [Thu, 9 Jan 2020 21:41:22 +0000 (13:41 -0800)]
HCI Controller tests
Bug:
147444951
Test: ./run_cert_facade_only.sh
Change-Id: I2c5b2bdc9b5a27cc14217aca8196eede6412c670
Myles Watson [Thu, 9 Jan 2020 17:59:31 +0000 (09:59 -0800)]
Direct HCI classic connection test
Bug:
147444951
Test: ./cert/run_cert_facade_only.sh
Change-Id: Ie075bbac29f2ac08d89b13d7a6c454f7f82bec2f
Automerger Merge Worker [Fri, 10 Jan 2020 02:45:35 +0000 (02:45 +0000)]
Redirect osi/config interface based upon gd status am:
38c43e4ce8 am:
1be85b4847
Change-Id: I97dd4ef4f61e3f7d9bb7e2ff5f43c21aca5707a5
Chris Manton [Fri, 10 Jan 2020 02:31:19 +0000 (18:31 -0800)]
Redirect osi/config interface based upon gd status
am:
38c43e4ce8
Change-Id: I99eeea4e6188d0bd2da35cdc530f54e245b818da
Rahul Sabnis [Fri, 10 Jan 2020 00:28:26 +0000 (16:28 -0800)]
Add setConnectionPolicy to HidDevice and Pan aidl
Bug:
147444905
Test: Manual
Change-Id: Ic29a7c08fab10b3c25b4708124eb9768ba84bbb4
Chris Manton [Thu, 9 Jan 2020 00:24:33 +0000 (16:24 -0800)]
Redirect osi/config interface based upon gd status
Initial entry to separate config implementation based
upon gd flag.
Test: Compiles
Bug:
147315979
Change-Id: Ic4156370911eebaddffb5394c0c34dde2a627ec9
Automerger Merge Worker [Thu, 9 Jan 2020 18:40:51 +0000 (18:40 +0000)]
Merge "Reset channel configuration state after closure" am:
0be4534880 am:
9737520c2b
Change-Id: Ie601d80d7f09d8f6628008aea4277acf0c33a009
Chris Manton [Thu, 9 Jan 2020 18:36:17 +0000 (10:36 -0800)]
Merge "Reset channel configuration state after closure"
am:
0be4534880
Change-Id: I0cf191b4ce71bbc957b351d54afdea0b68178749
Automerger Merge Worker [Thu, 9 Jan 2020 18:35:33 +0000 (18:35 +0000)]
Merge "Pass address type into shim::BTM_SecBond for LE devices" am:
5804d1a979 am:
8f9545aeb0
Change-Id: I53e013a9ad3f95dfe0eb809472d4e30e7779ee70
Treehugger Robot [Thu, 9 Jan 2020 18:34:53 +0000 (18:34 +0000)]
Merge "Reset channel configuration state after closure"
Jakub Pawlowski [Thu, 9 Jan 2020 18:20:55 +0000 (10:20 -0800)]
Merge "Pass address type into shim::BTM_SecBond for LE devices"
am:
5804d1a979
Change-Id: I9682d8b450232b7fa4fd0cfef2f2a512b5687aac
Treehugger Robot [Thu, 9 Jan 2020 18:18:24 +0000 (18:18 +0000)]
Merge "Pass address type into shim::BTM_SecBond for LE devices"
Cheney Ni [Thu, 9 Jan 2020 07:39:19 +0000 (15:39 +0800)]
A2DP: Reset the HAL pending command flag while clean up
In order to switch the audio HAL between software and offloading
encoders, there is a static flag shared between two HAL interfaces, and
is used to know whether the stack is still handling a previous task.
If audio HAL asked to start or suspend the playback while disabling
Bluetooth, the flag was assigned, but might not reset after A2DP clean
up. Since this is a static variable, it would be a worng value after
re-enabled, and should be reset while clean up or HAL interfaces'
initialization.
Bug:
147394596
Test: Turn off Bluetooth when A2DP playback
Change-Id: If14235f9cc302895049404a562ca0a27f416a3f2
Jakub Pawlowski [Tue, 7 Jan 2020 14:22:03 +0000 (15:22 +0100)]
Pass address type into shim::BTM_SecBond for LE devices
Previously stack used to store address type in security record database.
New stack will receive address type as one of the paramters to start the
bond.
Bug:
147086339
Change-Id: Ide684b8957516efc3f7cb4417ded61f27290ff81
OSDN Git Service
