OSDN Git Service
Treehugger Robot [Wed, 22 Jan 2020 00:12:27 +0000 (00:12 +0000)]
Merge "gd: Fix for l2cap connection on failure"
Treehugger Robot [Wed, 22 Jan 2020 00:11:20 +0000 (00:11 +0000)]
Merge "HCI: Add LocalName test"
Treehugger Robot [Tue, 21 Jan 2020 23:56:10 +0000 (23:56 +0000)]
Merge "Initial entry for headless"
Myles Watson [Fri, 17 Jan 2020 17:37:25 +0000 (09:37 -0800)]
HCI: Add LocalName test
Bug:
147444951
Test: ./cert/run_device_cert.sh
Change-Id: I9d3345d2316357beac727c9245134a8994aba25b
Chris Manton [Tue, 21 Jan 2020 19:34:00 +0000 (11:34 -0800)]
gd: Fix for l2cap connection on failure
Included method and parameter naming updates to reflect functionality
Bug:
140778599
Test: bt_headless with failing params
Change-Id: I5ed4e2769f7c8f6f78a92af76545e3a0e41582d1
Chris Manton [Wed, 15 Jan 2020 00:34:08 +0000 (16:34 -0800)]
Initial entry for headless
Bug:
147316415
Test: Compiles and sdp test runs
Change-Id: I2db01df68fb8807ce934b59aab5a4f593d4f8074
Myles Watson [Fri, 17 Jan 2020 21:46:23 +0000 (13:46 -0800)]
Split ports for device and root-canal tests
Use 89xx ports for Root-canal tests and 88xx for device tests.
Bug:
148096951
Test: ./cert/run_device_cert.sh && ./cert/run_cert_facade_only.sh
Change-Id: I4ad9357d882668058450b42473addb69a290e7f5
Treehugger Robot [Tue, 21 Jan 2020 20:08:55 +0000 (20:08 +0000)]
Merge "ACL packet recombination"
Hansong Zhang [Thu, 16 Jan 2020 22:05:41 +0000 (14:05 -0800)]
ACL packet recombination
Recombine ACL fragments according to indicated L2CAP PDU size. Used the
workaround that rootcanal always sends the same ACL packet to remote to
verify.
Also added ACL fragmentation support in rootcanal. Recombination in
rootcanal is not supported so far, so whenever we want to send an ACL
packet fragment, we never buffer it until we have a complete L2CAP PDU.
Test: cert/run_cert_facade_only.sh run_cert.sh
Change-Id: Ieb4d3c987327867a39ce210474b84645175b8984
Chris Manton [Sun, 19 Jan 2020 01:29:38 +0000 (17:29 -0800)]
Fix legacy shim namespace
Align namespaces to adhere to convention
Bug:
140421732
Test: Builds
Change-Id: I23e716f7250b79d147ba0db974b91578ebf63d56
Chris Manton [Sat, 18 Jan 2020 03:25:36 +0000 (19:25 -0800)]
Refactor dumpsys apis for legacy and gd
Unify legacy and gd dumpsys syntax.
Fix static initialization order problem.
Bug:
147672133
Test: bt_headless and bluetooth_test_gd
Change-Id: I6f4d0d2c5611deace5a2a11eff8001b624b3dc62
Treehugger Robot [Fri, 17 Jan 2020 23:48:27 +0000 (23:48 +0000)]
Merge "Shim stack facade test and fix for test"
Treehugger Robot [Fri, 17 Jan 2020 23:07:49 +0000 (23:07 +0000)]
Merge "Fix issue around Encryption during Pairing"
Chris Manton [Fri, 17 Jan 2020 18:32:53 +0000 (10:32 -0800)]
Shim stack facade test and fix for test
Accidently 'captured' a raw pointer into a unique
pointer, which forced deletion upon destruction
resulting in other modules who rely on the no-longer-
in-existance module to call the module's pure
virtual Stop() function which is a bad thing.
Bug:
140778599
Test: ./gd/cert/run_cert_facade_only.sh
Change-Id: Ie1e39430517e47497172786fe4d8ab4976c371b4
Treehugger Robot [Fri, 17 Jan 2020 18:59:33 +0000 (18:59 +0000)]
Merge "Cert: Swap Cert and DUT for device tests"
Jakub Pawlowski [Fri, 17 Jan 2020 18:54:47 +0000 (19:54 +0100)]
Fix issue around Encryption during Pairing
* ECC_PointMult erases private key argument, pass copy instead of
original value.
* Specify Z parameter for ECC Points
This fixes issues where LE Secure connection pairing between old and new
stack was failing due to DHKey mismatch
Test: manual pairing between phone running new and old stack
Bug:
147086339
Change-Id: Ied3404c2eb2ca55b717042ea099e1aefed1c3e8d
Treehugger Robot [Fri, 17 Jan 2020 16:39:06 +0000 (16:39 +0000)]
Merge "Hid: Fix connection issue with legacy mouse"
Myles Watson [Fri, 17 Jan 2020 16:28:02 +0000 (08:28 -0800)]
Cert: Swap Cert and DUT for device tests
Test: ./cert/run_device_cert.sh
Change-Id: Ib95eb8d2c7dacb252447902d0e0d6a366f20a01f
Treehugger Robot [Fri, 17 Jan 2020 14:24:38 +0000 (14:24 +0000)]
Merge "LE-COC: Free LE-COC server resource when BluetoothServerSocket is closed"
sravan voleti [Fri, 17 Jan 2020 08:44:37 +0000 (14:14 +0530)]
Hid: Fix connection issue with legacy mouse
use case:
1) Pair and connect mouse from DUT
2) Unpair mouse from DUT UI
3) Try to pair from mouse, SDP connection from dut
should fail during pairing.
4) Scan the mouse from DUT and initiate pairing.
Observed Results:
Pairing stuck in bonding state.
Root cause:
On sdp failure cases, HID incoming connection flags not cleared
and leading to HID connection and pairing failure in next outgoing pairing.
Fix:
Reset hid incoming connection flags when sdp fails,
to fix connection issue with specific HID mouse.
Fixes:
147856205
Test: Tested above use case with legacy mouse, issue not observed.
Change-Id: I11b5d52a78f861cc270d0736c912cd40f1b76d6d
Treehugger Robot [Fri, 17 Jan 2020 06:45:20 +0000 (06:45 +0000)]
Merge "A2DP: Based on the AAC parameters to calculate its encoder interval"
Jack He [Fri, 17 Jan 2020 00:20:06 +0000 (16:20 -0800)]
LE-COC: Free LE-COC server resource when BluetoothServerSocket is closed
* When BluetoothServerSocket is closed in the Java layer, the native
layer should respond by freeing all resources used by the server
including file descriptors, structs, PSMs, and security IDs
* We did this correctly for BR_EDR L2CAP COC channels after
I4e37dcd858af258fbd64fbfb2fbf0083bd743e06, but the same fix did not
apply to LE COC
* This CL make sure LE COC server resources are freed propertly upon
server fd closure
Test: open and close LE COC server repeatedly on an Android phone
Bug:
144148429
Change-Id: I16fa10e77612105d23848f71925ff6efc95bc75a
Hansong Zhang [Thu, 16 Jan 2020 23:11:22 +0000 (15:11 -0800)]
Rootcanal: Always send FIRST_NON_AUTOMATICALLY_FLUSHABLE
Controller should only send FIRST_NON_AUTOMATICALLY_FLUSHABLE to host
per spec 5.1 vol 2 part E 5.4.2
Test: run_cert.sh
Change-Id: Ia79a4a1d4e64de4ba0d59a44108db93e4a2f7c7a
Chris Manton [Thu, 16 Jan 2020 21:36:44 +0000 (13:36 -0800)]
Add queuing for incoming acl packets
If a second packet arrives to the acl while there is
already a packet being processed the code ASSERTS
with enqueue already registered.
Bug:
140778599
Test: Runs bt_headless for 100 runs with no errors
Change-Id: Ib7601eab2121b1888f58f71676f734080f41c8ec
Treehugger Robot [Thu, 16 Jan 2020 23:06:22 +0000 (23:06 +0000)]
Merge "PAN: Remove bta_pan_co_tx_writebuf (dead code)"
Treehugger Robot [Thu, 16 Jan 2020 21:53:30 +0000 (21:53 +0000)]
Merge "Delay removal of owned memory until close callback completes"
Chris Manton [Thu, 16 Jan 2020 19:25:06 +0000 (11:25 -0800)]
Delay removal of owned memory until close callback completes
Bug:
146086425
Test: bt_headless runs many (~100) iterations without this signature failure
Change-Id: I96a59ca80cf15ca0248e6ef2a0a2f1dcaf5c9fea
Chris Manton [Thu, 16 Jan 2020 17:53:17 +0000 (09:53 -0800)]
Add names for all shim modules
Bug:
140778599
Test: bluetooth_test_gd
Change-Id: Ie55ab28a5b1d748053c48835b2c9d7b855ede750
Jakub Pawlowski [Thu, 16 Jan 2020 14:55:42 +0000 (14:55 +0000)]
Merge "AclManager::create_le_connection fixes"
Treehugger Robot [Thu, 16 Jan 2020 14:07:39 +0000 (14:07 +0000)]
Merge "Convert on-device tests to facade_only"
Treehugger Robot [Thu, 16 Jan 2020 14:04:09 +0000 (14:04 +0000)]
Merge "SecurityManager: Call Init in the constructor"
Cheney Ni [Tue, 17 Dec 2019 07:47:01 +0000 (15:47 +0800)]
A2DP: Based on the AAC parameters to calculate its encoder interval
When running AAC software encoder, the PCM data size per AAC frame is:
1024 (sample counts per frame) * 2 (16 bits per sample) * 2 (stereo)
If we are using 44.1 kHz, the interval is about 23.22 ms. When using 48
kHz, it is about 21.33 ms. Here we determine the interval based on the
codec configuration and feeding parameters while updating the AAC
encoder.
Bug:
146399686
Test: There were AAC frames every 23 ms in BTSnoop
Change-Id: I8af7696917b007cb751a8991f21b344724b9ba94
Treehugger Robot [Thu, 16 Jan 2020 13:06:08 +0000 (13:06 +0000)]
Merge "HCI: Add an LeAclManagerFacade and tests"
Jakub Pawlowski [Mon, 13 Jan 2020 19:25:45 +0000 (20:25 +0100)]
AclManager::create_le_connection fixes
* modern controllers require "Enhanced" version of Create Connection
Command
* They also require "Set Random Address" to be used before attempting to
create connection
* Use same parameters for connection initiation as the old stack is using
Test: Attempt to Bond with LE device
Change-Id: I58eb54b4e45f5884a69079421b7a2c6a67b7a2bd
Treehugger Robot [Thu, 16 Jan 2020 06:14:49 +0000 (06:14 +0000)]
Merge "L2CAP: Call Authenticate for the Classic Pairing service"
Treehugger Robot [Thu, 16 Jan 2020 02:05:23 +0000 (02:05 +0000)]
Merge "Remove async grpc helper"
Treehugger Robot [Thu, 16 Jan 2020 01:36:22 +0000 (01:36 +0000)]
Merge "Fix flaky gd unit tests"
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
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 [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
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"
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"
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
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
Treehugger Robot [Mon, 13 Jan 2020 23:46:31 +0000 (23:46 +0000)]
Merge "Fix Neighbor Test"
Treehugger Robot [Mon, 13 Jan 2020 23:17:02 +0000 (23:17 +0000)]
Merge "Updates for bison 3.5"
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
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
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
Treehugger Robot [Sat, 11 Jan 2020 11:08:06 +0000 (11:08 +0000)]
Merge "Add LeExtendedCreateConnection definition"
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
Treehugger Robot [Fri, 10 Jan 2020 20:19:36 +0000 (20:19 +0000)]
Merge "Add setConnectionPolicy to HidDevice and Pan aidl"
Treehugger Robot [Fri, 10 Jan 2020 20:09:43 +0000 (20:09 +0000)]
Merge changes I06aadb55,I2c5b2bdc
* changes:
AclManagerFacade
HCI Controller tests
Treehugger Robot [Fri, 10 Jan 2020 20:02:34 +0000 (20:02 +0000)]
Merge "Direct HCI classic connection test"
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
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
Treehugger Robot [Thu, 9 Jan 2020 18:34:53 +0000 (18:34 +0000)]
Merge "Reset channel configuration state after closure"
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
Chris Manton [Thu, 9 Jan 2020 06:51:12 +0000 (22:51 -0800)]
Reset channel configuration state after closure
Bug:
146086425
Test: bt_headless running multiple sdp queries
Change-Id: I20687fefdeb05ec3005e47dbd2cceb26e9130b26
Treehugger Robot [Thu, 9 Jan 2020 00:25:32 +0000 (00:25 +0000)]
Merge "Properly delete pending connections"
Treehugger Robot [Wed, 8 Jan 2020 21:47:13 +0000 (21:47 +0000)]
Merge "Fix L2CAP cert and remove legacy HCI cert"
Treehugger Robot [Wed, 8 Jan 2020 21:10:09 +0000 (21:10 +0000)]
Merge "Remove 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
Chris Manton [Wed, 8 Jan 2020 17:49:52 +0000 (09:49 -0800)]
Properly delete pending connections
Ensure that pending connections complete their lifecycle
after either opened or failed conditions occur
Bug:
147316415
Test: bt_headless using sdp queries
Change-Id: If00204755ec24d4e6c6a5ff1c92a05b2404ce70e
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
Treehugger Robot [Wed, 8 Jan 2020 18:50:56 +0000 (18:50 +0000)]
Merge "Replace source files with static library"
Treehugger Robot [Wed, 8 Jan 2020 18:49:36 +0000 (18:49 +0000)]
Merge "Remove 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
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
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
Rahul Sabnis [Tue, 7 Jan 2020 20:56:31 +0000 (12:56 -0800)]
Merge "Add setConnectionPolicy to IBluetoothPbap.aidl"
am:
c999e08380
Change-Id: I69e776c58e33124e36b022370a9c82277c8760f7
Treehugger Robot [Tue, 7 Jan 2020 20:33:21 +0000 (20:33 +0000)]
Merge "Add setConnectionPolicy to IBluetoothPbap.aidl"
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
Treehugger Robot [Tue, 7 Jan 2020 19:05:59 +0000 (19:05 +0000)]
Merge "HCI: Add LE Scanning Manager test"
Myles Watson [Tue, 7 Jan 2020 17:59:08 +0000 (09:59 -0800)]
Only include common.proto when used
am:
6e648ddd5f
Change-Id: I4ab7f755604d99fdd66bf3cedc9344c167ee61f0
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
Jakub Pawlowski [Tue, 7 Jan 2020 16:09:57 +0000 (08:09 -0800)]
Merge BTM_SecBond and BTM_SecBondByTransport
am:
948aeebcbf
Change-Id: I7c960c939944d06dc74391862438954ab157aea9
OSDN Git Service
