OSDN Git Service
Yi Kong [Thu, 14 Dec 2017 21:54:07 +0000 (21:54 +0000)]
Merge "btif_sock_rfc: Use %u for uint32_t" am:
c30ff64348 am:
7efbdaf0dd
am:
d79e253306
Change-Id: Ic42e20f1deabb4ea597da9f019716edb96c2d91d
Yi Kong [Thu, 14 Dec 2017 21:42:38 +0000 (21:42 +0000)]
Merge "btif_sock_rfc: Use %u for uint32_t" am:
c30ff64348
am:
7efbdaf0dd
Change-Id: I2468a22c1ca37fde3b2d40f2df78fe48b1b3db03
Yi Kong [Thu, 14 Dec 2017 21:40:06 +0000 (21:40 +0000)]
Merge "btif_sock_rfc: Use %u for uint32_t"
am:
c30ff64348
Change-Id: I93406b27af75662f0d5f58b9438eeffa1c547f07
Treehugger Robot [Thu, 14 Dec 2017 21:27:12 +0000 (21:27 +0000)]
Merge "btif_sock_rfc: Use %u for uint32_t"
Jakub Pawlowski [Thu, 14 Dec 2017 20:14:06 +0000 (20:14 +0000)]
Merge "Fix Bluetooth crash on user switching" am:
7dba951c61 am:
0fdf1d9e45
am:
646e27426c
Change-Id: I5c738b8218b284267f53029ae91cee65a3ec83a9
Chao Quan [Thu, 14 Dec 2017 20:13:37 +0000 (20:13 +0000)]
Fix GATT discovery service fail over BR/EDR am:
b00872797a am:
a2e11ccd58
am:
d81717e1e1
Change-Id: I93e6be464bf38889e1e26e0d0c9c23f0a50f5efb
Jakub Pawlowski [Thu, 14 Dec 2017 20:04:02 +0000 (20:04 +0000)]
Merge "Fix Bluetooth crash on user switching" am:
7dba951c61
am:
0fdf1d9e45
Change-Id: Ie2cd358e7dc7762953e5562d0542876f0cb9215e
Chao Quan [Thu, 14 Dec 2017 20:03:18 +0000 (20:03 +0000)]
Fix GATT discovery service fail over BR/EDR am:
b00872797a
am:
a2e11ccd58
Change-Id: Icfdc12c1b57e13852027be563a152990b3b4d599
Jakub Pawlowski [Thu, 14 Dec 2017 19:55:03 +0000 (19:55 +0000)]
Merge "Fix Bluetooth crash on user switching"
am:
7dba951c61
Change-Id: Iee0f6698d762c0a88d5140c3fd9a9893c7370aaf
Chao Quan [Thu, 14 Dec 2017 19:54:35 +0000 (19:54 +0000)]
Fix GATT discovery service fail over BR/EDR
am:
b00872797a
Change-Id: Ib2b8a7cfe8757942a1eb25dd14c298a15809d5c5
Treehugger Robot [Thu, 14 Dec 2017 19:36:56 +0000 (19:36 +0000)]
Merge "Fix Bluetooth crash on user switching"
Chao Quan [Mon, 23 Oct 2017 11:41:13 +0000 (19:41 +0800)]
Fix GATT discovery service fail over BR/EDR
According to the current gattc state machine, stack queues
discovery services request comes from framework when gattc
is in BTA_GATTC_DISCOVER_ST state. This request is re-scheduled
after discovery on server finished in bta_gattc_disc_cmpl
and return the discovery results to framemwork. But now, stack
assumed LE transport in code, which prevents discovery services
executing. This error can be detected by ACTS GATTOverBrEdrTest:
test_gatt_bredr_connect_trigger_on_services_discovered
Fix assumed transport to actual situantion
Test: ACTS GATTOverBrEdrTest:
test_gatt_bredr_connect_trigger_on_services_discovered
Change-Id: I110a0a3c19595fb76c3bb15b092ce18ebf7b11bf
Jakub Pawlowski [Thu, 14 Dec 2017 17:26:43 +0000 (09:26 -0800)]
Fix Bluetooth crash on user switching
Test: compilation
Fixes:
70634701
Change-Id: I571bb8dde1317b2a7e4a73a1316c4c26d0f19466
Yi Kong [Wed, 6 Dec 2017 00:25:56 +0000 (16:25 -0800)]
btif_sock_rfc: Use %u for uint32_t
Discovered by the upcoming compiler update.
Test: build
Change-Id: If1497232b8f74bfc95194126a398e62f6eda7672
Jack He [Thu, 14 Dec 2017 00:35:36 +0000 (00:35 +0000)]
HFP: Fix static check errors am:
6545d3f346 am:
1c6f29b581
am:
97f0b9a3be
Change-Id: I415ea0b2dd86a452ef5ce950afe05b0fc45e9b84
Jack He [Thu, 14 Dec 2017 00:32:33 +0000 (00:32 +0000)]
HFP: Fix static check errors am:
6545d3f346
am:
1c6f29b581
Change-Id: Ie16c6fe92ccdef7280d83edf913cbc1bae9372a7
Jack He [Thu, 14 Dec 2017 00:18:36 +0000 (00:18 +0000)]
HFP: Fix static check errors
am:
6545d3f346
Change-Id: I94c8a817b847f7a4136d5c150db6044c55188893
Jack He [Tue, 12 Dec 2017 03:49:30 +0000 (19:49 -0800)]
HFP: Fix static check errors
* In bta/ag and btif/btif_hf.cc
* Simplify boolean values
* Use nullptr intead of NULL
* Use C++ style include headers instead of C style ones
* Remove unused struct definitions
* Remove unused code from bta_ag_ci.h/cc
* Use range based for-loop when it can be converted automatically
* Use C++ style zero-initialization instead of memset so that non-POD
members of structs can be initialized properly
* Use "" to initliaze char array since the rest of the array will be
zero padded if the array is assigned to a shorter string than its
length
Bug:
68340193
Test: make, connect to HFP enabled device
Change-Id: I25c1e48ca1cb40629b9b60243ec462f498d8fc24
Jakub Pawlowski [Wed, 13 Dec 2017 22:18:12 +0000 (22:18 +0000)]
Merge "Bump GATT cache file version marker" am:
4edb5857bc am:
d693a71833
am:
80e840c251
Change-Id: I3da6cf1addebb2f50998dffeaa86af4ce840aff3
Jakub Pawlowski [Wed, 13 Dec 2017 22:07:12 +0000 (22:07 +0000)]
Merge "Bump GATT cache file version marker" am:
4edb5857bc
am:
d693a71833
Change-Id: I0f6e5bdb24ef6a6dff88b09288e1e70413813705
Jakub Pawlowski [Wed, 13 Dec 2017 21:58:44 +0000 (21:58 +0000)]
Merge "Bump GATT cache file version marker"
am:
4edb5857bc
Change-Id: Ie2636872c56069c558e236fda9877d2be5d049cc
Treehugger Robot [Wed, 13 Dec 2017 21:54:02 +0000 (21:54 +0000)]
Merge "Bump GATT cache file version marker"
Jakub Pawlowski [Wed, 13 Dec 2017 18:02:32 +0000 (10:02 -0800)]
Bump GATT cache file version marker
In commit
819e2ecb84, the type used for UUID in the GATT cache was changed
from tBT_UUID to bluetooth:Uuid. This changed the binary representation of
this field. 18 bytes were used previously, now only 16 bytes are used.
This change made GATT cache file format incompatible between Android
versions, and requires an increment of cache file format version.
Fixes:
70297056
Test: added GattCacheTest
Change-Id: I4bceada300dbe3aab10d14df2aa853e4573c536e
Vishwath Mohan [Wed, 13 Dec 2017 21:13:07 +0000 (21:13 +0000)]
Merge "Fix callback type mismatches in Bluetooth" am:
f527f08e4f am:
531cb7585c
am:
4d657d64d8
Change-Id: I69407b206a481c3409448b9938ccd2eabbcdbb2e
Matadeen Mishra [Wed, 13 Dec 2017 21:12:39 +0000 (21:12 +0000)]
Added check to know the status of any ongoing pairing status. am:
6cc4234169 am:
56f9b89cbd
am:
2e39467e87
Change-Id: I2840d86a68e9730661f81ab48ab0f13e1e0318a9
Vishwath Mohan [Wed, 13 Dec 2017 21:08:28 +0000 (21:08 +0000)]
Merge "Fix callback type mismatches in Bluetooth" am:
f527f08e4f
am:
531cb7585c
Change-Id: Ib8f36cdb248fe94d1467be0207419d4084170e57
Matadeen Mishra [Wed, 13 Dec 2017 21:08:01 +0000 (21:08 +0000)]
Added check to know the status of any ongoing pairing status. am:
6cc4234169
am:
56f9b89cbd
Change-Id: I74683ee03a9c2fc129e9db25100961bfe960b279
Vishwath Mohan [Wed, 13 Dec 2017 21:05:02 +0000 (21:05 +0000)]
Merge "Fix callback type mismatches in Bluetooth"
am:
f527f08e4f
Change-Id: I8963109fe921b84fcfa31f096a26ffd420af182a
Matadeen Mishra [Wed, 13 Dec 2017 21:04:37 +0000 (21:04 +0000)]
Added check to know the status of any ongoing pairing status.
am:
6cc4234169
Change-Id: If0868cfe6d496027199f040ba72175a603353776
Vishwath Mohan [Wed, 13 Dec 2017 21:00:31 +0000 (21:00 +0000)]
Merge "Fix callback type mismatches in Bluetooth"
Matadeen Mishra [Tue, 21 Jun 2016 12:27:31 +0000 (17:57 +0530)]
Added check to know the status of any ongoing pairing status.
Use Case: Host allows incoming pairing even though outgoing pairing
is in process.
Steps:
1. Initiate bonding from Mecapp and provide pin key at Mecapp pairing
pop-up.
2. Start pairing for Logitech mouse from DUT and click on accept
pairing at mecapp pairing pop-up.
3. Give the same pin key for mecapp pairing pop-up at DUT side and
observe the behavior.
Failure: Incoming request is getting from remote and got a pop-up
for PIN request.
Root Cause: Pairing was auto accepted for remote device while
pairing was in progress with another remote device leading to
inconsistent behavior.
Fix: Rejects incoming pairing request from remote device
if already in pairing state.
Test: Tested with HID Logitech Mouse
Fixes:
35417665
Change-Id: I19a2a98e4ceb51cabaef279a2e3f8224fbed9ea1
Vishwath Mohan [Mon, 4 Dec 2017 21:28:06 +0000 (13:28 -0800)]
Fix callback type mismatches in Bluetooth
This CL fixes some mismatches between defined callback signatures and
the signatures of the functions that are actually passed in as that
type.
Bug:
67507323
Test: lunch walleye_cfi && m -j50
Change-Id: Ia5c22ac614c34cc8bd8a370861d988bb9f8034a6
TreeHugger Robot [Wed, 13 Dec 2017 04:50:43 +0000 (04:50 +0000)]
Merge "bt: Update libchrome APIS to r456626."
Hemant Gupta [Wed, 13 Dec 2017 03:21:45 +0000 (03:21 +0000)]
Merge "BLE: Don't set SC bit in AuthReq for Legacy Devices" am:
9d4686bd2f am:
ccdba8bdb5
am:
13276dd88e
Change-Id: I9bdecffacba1b4e8a68099c439c81b360eb1efcc
Satish Kodishala [Wed, 13 Dec 2017 03:21:14 +0000 (03:21 +0000)]
Merge "Check MT call setup state before starting ring timer" am:
964542b8e6 am:
2fa8382fac
am:
203c8793aa
Change-Id: I680b9b660545df1b4d57147c700c9eb272af733b
Hemant Gupta [Wed, 13 Dec 2017 02:55:15 +0000 (02:55 +0000)]
Merge "BLE: Don't set SC bit in AuthReq for Legacy Devices" am:
9d4686bd2f
am:
ccdba8bdb5
Change-Id: I84b8fb11dbd5f82bc11405f0d4d5a9d78b7ab0da
Satish Kodishala [Wed, 13 Dec 2017 02:54:46 +0000 (02:54 +0000)]
Merge "Check MT call setup state before starting ring timer" am:
964542b8e6
am:
2fa8382fac
Change-Id: I22bc5f0fa848f125cc34fe353aa8e24d65f20108
Hemant Gupta [Wed, 13 Dec 2017 01:58:11 +0000 (01:58 +0000)]
Merge "BLE: Don't set SC bit in AuthReq for Legacy Devices"
am:
9d4686bd2f
Change-Id: I8613157bff638cef511af4b29cf0adc5902a7911
Satish Kodishala [Wed, 13 Dec 2017 01:57:44 +0000 (01:57 +0000)]
Merge "Check MT call setup state before starting ring timer"
am:
964542b8e6
Change-Id: I9e2be9fba8c802e933ea853dc0130d8271ba252f
Treehugger Robot [Wed, 13 Dec 2017 01:21:23 +0000 (01:21 +0000)]
Merge "BLE: Don't set SC bit in AuthReq for Legacy Devices"
Treehugger Robot [Wed, 13 Dec 2017 00:31:35 +0000 (00:31 +0000)]
Merge "Check MT call setup state before starting ring timer"
Hemant Gupta [Wed, 6 Dec 2017 10:05:20 +0000 (15:35 +0530)]
BLE: Don't set SC bit in AuthReq for Legacy Devices
Disable SC bit for legacy LE devices (< 4.2) since as per earlier
spec, this BIT should be 0 and ignored by remote device. Some remote
legacy devices which don't follow the approach of ignoring these bits
(if set) go in bad state and result in SMP pairing failure.
Test: Pairing succeeds with remote device after resettings SC bit.
Fixes:
70259025
Change-Id: I35838c60fb08916a141f764b3e1922d277b99f28
Myles Watson [Tue, 12 Dec 2017 19:52:27 +0000 (19:52 +0000)]
AVRCP: Flush the command queue in AVRC_Close am:
a701c777af am:
1355755aa0
am:
0616d66b57
Change-Id: I7f7c8c2dfb9c0bb36934d9ae053cdc893d926468
Myles Watson [Tue, 12 Dec 2017 19:50:24 +0000 (19:50 +0000)]
AVRCP: Flush the command queue in AVRC_Close am:
a701c777af
am:
1355755aa0
Change-Id: Ic7432a2c90a66d6498bac4994a75b1628c3c27ac
Myles Watson [Tue, 12 Dec 2017 19:46:49 +0000 (19:46 +0000)]
AVRCP: Flush the command queue in AVRC_Close
am:
a701c777af
Change-Id: I1fdbe972e912ca1a06e6b83e336080733a0b5cf1
Myles Watson [Tue, 12 Dec 2017 00:23:21 +0000 (16:23 -0800)]
AVRCP: Flush the command queue in AVRC_Close
Test: toggle BR/EDR, manually inspect open files using lsof
Change-Id: I7bdc3a3840e7cc31894a9050dd5b7c29f863bb30
Hansong Zhang [Tue, 12 Dec 2017 19:36:07 +0000 (19:36 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (3/3)" am:
eb9d2cff70 am:
f6eef672cd
am:
1fa23b6c5b
Change-Id: Id8bd96fe5d8c230783cd417eef9cba2ce63400dd
Hansong Zhang [Tue, 12 Dec 2017 19:22:24 +0000 (19:22 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (3/3)" am:
eb9d2cff70
am:
f6eef672cd
Change-Id: I4dbc0ed7c1a6fc97eedafa5a637c53dac8f6d878
Hansong Zhang [Tue, 12 Dec 2017 19:12:15 +0000 (19:12 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (3/3)"
am:
eb9d2cff70
Change-Id: I3e129b74d7cb224754d35e0be01c1f73be361ea4
Treehugger Robot [Tue, 12 Dec 2017 19:02:26 +0000 (19:02 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (3/3)"
Jay Civelli [Mon, 27 Mar 2017 16:53:18 +0000 (09:53 -0700)]
bt: Update libchrome APIS to r456626.
The new libchrome has been ported from Chromium and some APIs
have changed. Make necessary changes at call sites.
Test: Build.
Change-Id: I0cc2cf8521caf5f6f69346bb3ce3dc1c59b95cc6
Myles Watson [Sat, 9 Dec 2017 03:12:23 +0000 (03:12 +0000)]
binder: Call writeParcelFileDescriptor() am:
be797989f1 am:
f75c993b8e
am:
3e276fa438
Change-Id: Id9fc98b9f2bf12594f45c3d871c38ccb523a07bf
Myles Watson [Sat, 9 Dec 2017 03:07:11 +0000 (03:07 +0000)]
binder: Call writeParcelFileDescriptor() am:
be797989f1
am:
f75c993b8e
Change-Id: Ic000e817698ceb2caaaad78f3c746977c9a244b2
Myles Watson [Sat, 9 Dec 2017 03:02:04 +0000 (03:02 +0000)]
binder: Call writeParcelFileDescriptor()
am:
be797989f1
Change-Id: I642871e90d7c3350a21f2b2641b6a1575c68a326
Myles Watson [Fri, 8 Dec 2017 23:50:49 +0000 (15:50 -0800)]
binder: Call writeParcelFileDescriptor()
Fixes:
69678755
Test: manual inspection using lsof
Change-Id: Ifcb5af2d5797e667c20d4c41ad836cf7626e9909
Hansong Zhang [Sat, 9 Dec 2017 00:08:34 +0000 (16:08 -0800)]
Make BluetoothPbap implement BluetoothProfile (3/3)
Change AIDL method signatures:
* Removed connect()
* Add BluetoothDevice parameter for disconnect()
* Rename other method names to be consistent with BluetoothProfile
methods
Test: test with PBAP carkits
Bug:
69417672
Change-Id: Ide81254d71128b9d204b63aa60bc39752add6edd
Jack He [Fri, 8 Dec 2017 03:50:49 +0000 (03:50 +0000)]
Merge "HFP: Remove dead code in native interface" am:
2fbb2e982e am:
02e8c84a46
am:
6925ccb88d
Change-Id: I9b242a43be91c1aa8185a64c4a2cb5d434bb7a53
Jakub Pawlowski [Fri, 8 Dec 2017 03:39:08 +0000 (03:39 +0000)]
Merge "Make LE CoC Maximum PDU Size configurable" am:
bde88fa29c am:
4748b50e43
am:
c77e1d79fa
Change-Id: I887e676d603a373f7c90e8c3352e71a03619fa13
Jack He [Fri, 8 Dec 2017 03:38:36 +0000 (03:38 +0000)]
Merge "BTIF: Fix return types of interface getters" am:
946ddd2770 am:
6f3e31b153
am:
a2cd209fc9
Change-Id: I54d735d1a2b98df09ce20c1e7e3c386df85d3fe1
Jakub Pawlowski [Fri, 8 Dec 2017 03:38:05 +0000 (03:38 +0000)]
GATT cache memory corruption fix am:
6918d40fd9 am:
52cec2dc82
am:
20dc00c6b6
Change-Id: Ia86ea74cb8978d9cc1ac912482e881aef73d5c29
Jakub Pawlowski [Fri, 8 Dec 2017 03:37:35 +0000 (03:37 +0000)]
BTA GATT operation queue am:
80c1e1c494 am:
5735d8495b
am:
eedbebe99f
Change-Id: I3de89eacbd3c78a0fbd04af4bdc5a96a59bfe317
Jack He [Fri, 8 Dec 2017 01:48:37 +0000 (01:48 +0000)]
Merge "HFP: Remove dead code in native interface" am:
2fbb2e982e
am:
02e8c84a46
Change-Id: Iae1ea2008cb74d9a51ea872f87ffcc495e3baf6d
Jack He [Fri, 8 Dec 2017 01:37:44 +0000 (01:37 +0000)]
Merge "HFP: Remove dead code in native interface"
am:
2fbb2e982e
Change-Id: Id8a4f4b3446b77f4ea57b3af8e900c48065c3f45
Treehugger Robot [Fri, 8 Dec 2017 01:14:59 +0000 (01:14 +0000)]
Merge "HFP: Remove dead code in native interface"
Jakub Pawlowski [Thu, 7 Dec 2017 22:34:34 +0000 (22:34 +0000)]
Merge "Make LE CoC Maximum PDU Size configurable" am:
bde88fa29c
am:
4748b50e43
Change-Id: I89d86e5b1c2b2a4a8670050ce16d7c9649896cb2
Jakub Pawlowski [Thu, 7 Dec 2017 22:32:01 +0000 (22:32 +0000)]
Merge "Make LE CoC Maximum PDU Size configurable"
am:
bde88fa29c
Change-Id: I5a898bd5f71dcaf00674125ee25d6e80247660d1
Treehugger Robot [Thu, 7 Dec 2017 22:20:51 +0000 (22:20 +0000)]
Merge "Make LE CoC Maximum PDU Size configurable"
Jakub Pawlowski [Tue, 5 Dec 2017 07:17:49 +0000 (23:17 -0800)]
Make LE CoC Maximum PDU Size configurable
Hearing Aid will need to modify this value. For existing code keep the
value as is.
Test: none
Bug:
69623109
Change-Id: I8c97882b5dd08a049d3a958c51163bad41df4d6a
Jack He [Thu, 7 Dec 2017 20:37:01 +0000 (20:37 +0000)]
Merge "BTIF: Fix return types of interface getters" am:
946ddd2770
am:
6f3e31b153
Change-Id: I85486eaeacb5fe51e0ad8b847e89b59a41e5ebd9
Jack He [Thu, 7 Dec 2017 20:34:30 +0000 (20:34 +0000)]
Merge "BTIF: Fix return types of interface getters"
am:
946ddd2770
Change-Id: I9121c1a99c593b2b27e15695121ed667f64008b8
Treehugger Robot [Thu, 7 Dec 2017 20:21:54 +0000 (20:21 +0000)]
Merge "BTIF: Fix return types of interface getters"
Jakub Pawlowski [Thu, 7 Dec 2017 20:18:02 +0000 (20:18 +0000)]
GATT cache memory corruption fix am:
6918d40fd9
am:
52cec2dc82
Change-Id: I0ac29e9ccb727a9f436df8d523d4c41f03d2297d
Jakub Pawlowski [Thu, 7 Dec 2017 20:13:22 +0000 (20:13 +0000)]
GATT cache memory corruption fix
am:
6918d40fd9
Change-Id: I7b5d4804d17675198c5995fa18faff74f0a2efae
Jack He [Thu, 7 Dec 2017 19:19:06 +0000 (11:19 -0800)]
HFP: Remove dead code in native interface
The following hidden API methods are not implemented by the stack and
should be removed:
- getBatteryUsageHint()
- acceptIncomingConnect()
- rejectIncomingConnect()
The following hidden API methods are no longer needed due to lack of
usage and should be removed:
- enableWBS()
- disableWBS()
- bindResponse()
Bug:
70336991
Test: make
Change-Id: Ifa0d3cbdf4487465782144b84a2bed5e4f7acc4e
Jakub Pawlowski [Tue, 5 Dec 2017 12:05:46 +0000 (04:05 -0800)]
GATT cache memory corruption fix
When doing GATT discovery, we interleave adding elements to vector,
and storing pointers to them. This can cause memory corruption, because
vector can reallocate the memory when adding element, leaving the pointers
invalid. To fix that, never store pointers to mutable vector elements.
Bug:
70041392
Test: manual, connected to HID device
Change-Id: I6bb3fec61afa742f446b66e3291c5f326738ee17
Jakub Pawlowski [Thu, 7 Dec 2017 18:40:54 +0000 (18:40 +0000)]
BTA GATT operation queue am:
80c1e1c494
am:
5735d8495b
Change-Id: I3323250be3ad5b7a2eaa23843b0390614a7fe354
Jakub Pawlowski [Thu, 7 Dec 2017 18:22:40 +0000 (18:22 +0000)]
BTA GATT operation queue
am:
80c1e1c494
Change-Id: I771d06a5fb93f7a02a1cad8e70a158c2a523a5d0
Jakub Pawlowski [Thu, 30 Nov 2017 05:49:32 +0000 (21:49 -0800)]
BTA GATT operation queue
Currently, HID BTA app have own GATT queue for scheduling reads/writes
during device setup. Such queue will also be needed for Hearing Aid.
This patch makes the GATT queue code generic and clean it up.
Test: manual, bond HID device
Bug:
69623109
Change-Id: Ic893d630ab5154f7c1875748f3e275cbad02a7b2
Eagle Kang [Thu, 7 Dec 2017 05:56:54 +0000 (05:56 +0000)]
Merge "Log BT Trace levels per profile" am:
792a202b39 am:
44642fddb9
am:
e213ab9d35
Change-Id: I71b281fb22749e33a7077c31ff93c37a1f8158ee
Hansong Zhang [Thu, 7 Dec 2017 05:25:59 +0000 (05:25 +0000)]
Merge "Remove BluetoothHidDeviceAppConfiguration (1/4)" am:
ad8c5197e2 am:
bb17accde4
am:
911d69aa2f -s ours
Change-Id: I87a8eb50554596a23476e977943d1812e0a8ff00
Venkata Jagadeesh Garaga [Thu, 7 Dec 2017 05:25:09 +0000 (05:25 +0000)]
Remove the remote from paired list when auth fails am:
dae4076bcb am:
01c831aed7
am:
c6aa47fcbb
Change-Id: I82558a38edbd811ecf09ec150f22eb9056215d2d
Jack He [Mon, 4 Dec 2017 22:30:42 +0000 (14:30 -0800)]
BTIF: Fix return types of interface getters
* They should return const pointer to interface structs
* Fixed return type for btif_rc_ctrl_get_interface, it should be
"const btrc_ctrl_interface_t*" but was "btrc_interface_t*". Later
casting masked this error, but it may hurt us in the future if not
fixed
Test: make
Change-Id: I41b2366cce68b1338761d84cef9ab986fd3334df
Eagle Kang [Wed, 6 Dec 2017 21:07:38 +0000 (21:07 +0000)]
Merge "Log BT Trace levels per profile" am:
792a202b39
am:
44642fddb9
Change-Id: If27b5a946cf2fbd63f1debcd6e3b27f53ae7ad0d
Eagle Kang [Wed, 6 Dec 2017 21:04:38 +0000 (21:04 +0000)]
Merge "Log BT Trace levels per profile"
am:
792a202b39
Change-Id: If37fac010c209f8bab22a6a3837db019e142b3fa
Treehugger Robot [Wed, 6 Dec 2017 20:51:42 +0000 (20:51 +0000)]
Merge "Log BT Trace levels per profile"
Hansong Zhang [Wed, 6 Dec 2017 20:50:40 +0000 (20:50 +0000)]
Merge "Remove BluetoothHidDeviceAppConfiguration (1/4)" am:
ad8c5197e2
am:
bb17accde4
Change-Id: I6701c5abd591d1a38f72ec4b0ed59d1b7e18c2cb
Hansong Zhang [Wed, 6 Dec 2017 20:34:01 +0000 (20:34 +0000)]
Merge "Remove BluetoothHidDeviceAppConfiguration (1/4)"
am:
ad8c5197e2
Change-Id: If7ac469d6047883aa00efc267f9123b41205ddda
Treehugger Robot [Wed, 6 Dec 2017 19:34:22 +0000 (19:34 +0000)]
Merge "Remove BluetoothHidDeviceAppConfiguration (1/4)"
Venkata Jagadeesh Garaga [Wed, 6 Dec 2017 19:12:06 +0000 (19:12 +0000)]
Remove the remote from paired list when auth fails am:
dae4076bcb
am:
01c831aed7
Change-Id: Ib7e4d4edc64e24b5c2bceb276e7c97b1ebe13937
Venkata Jagadeesh Garaga [Wed, 6 Dec 2017 19:06:40 +0000 (19:06 +0000)]
Remove the remote from paired list when auth fails
am:
dae4076bcb
Change-Id: I5c0d47a55b13e2b4bf13678edcb45e01584d8cad
Venkata Jagadeesh Garaga [Sun, 30 Jul 2017 11:05:54 +0000 (16:35 +0530)]
Remove the remote from paired list when auth fails
Problem:
Remote stuck in connecting state during reconnection.
Steps:
1.Pair and connect the remote.
2.disconnect the remote and try to connect again from the DUT. In few trial authentication failure observed.
Root Cause:
During profile re connection scenario stack not posting
bond state change call back with bond none state if any
authentication failure. Any profile connection triggered
after this can stuck in security procedure and
never recovers.
Fix:
Hence remove the remote from paired list when auth fails
Test: manual
Bug:
69028610
Change-Id: I6ac627e733f8b0b191c600153542acbb07f8c7a8
Satish Kodishala [Wed, 13 Jan 2016 13:53:04 +0000 (19:23 +0530)]
Check MT call setup state before starting ring timer
Test: 1. Pair and connect to Bluetooth Headset.
2. Make an incoming call and accept it from phone or BT headset.
Failure:
User may hear ring although incoming call accepted.
Root cause:
There is a ring timer to send RING every 5 secs to connected
headset until the MT call is accepted. When the call is
accepted, we stop the ring timer and send call indicators.
In case, just at the same time the ring timer stopped and
call indicators sent, if ring timer expired, it will be started
again.
Fix:
Start the ring timer only if the call is not accepted yet.
Bug:
35415875
Change-Id: Ifbde9ac45ac406f46e418a8d20abff0fefe6d414
Eagle Kang [Thu, 13 Apr 2017 06:50:53 +0000 (14:50 +0800)]
Log BT Trace levels per profile
BT stack trace level load from bt_stack.conf.
This change help developer to know BT stack log level
when analyze main logs.
Test: manual
Change-Id: I00037ac7d3a4bf88ea027ded77f22bef212a5874
TreeHugger Robot [Tue, 5 Dec 2017 22:10:10 +0000 (22:10 +0000)]
Merge "Remove BluetoothHidDeviceAppConfiguration (1/4)"
Jakub Pawlowski [Tue, 5 Dec 2017 18:34:46 +0000 (18:34 +0000)]
Merge "Add missing space in GATT_Register log" am:
563d7af58d am:
ccac0c2770
am:
b08945c8f4
Change-Id: I86a80d8d5e2373a1a275c6ee701d5eb9e44111fa
Jakub Pawlowski [Tue, 5 Dec 2017 18:31:49 +0000 (18:31 +0000)]
Merge "Add missing space in GATT_Register log" am:
563d7af58d
am:
ccac0c2770
Change-Id: I67d254b28316110fe4b5d9c7116faeb55d667a11
Jakub Pawlowski [Tue, 5 Dec 2017 18:28:42 +0000 (18:28 +0000)]
Merge "Add missing space in GATT_Register log"
am:
563d7af58d
Change-Id: Ic74998a761cfaedf42e18fceea0006c386a93a66
Treehugger Robot [Tue, 5 Dec 2017 18:07:27 +0000 (18:07 +0000)]
Merge "Add missing space in GATT_Register log"
Chao Quan [Tue, 5 Dec 2017 14:39:59 +0000 (14:39 +0000)]
Find connection ID on BR/EDR am:
72b64d5302 am:
5f72f2a9bb
am:
60d1ee55e2
Change-Id: I12d076bd9ea22ea3cdb02f3347390fca18c2d11d
Chao Quan [Tue, 5 Dec 2017 14:37:27 +0000 (14:37 +0000)]
Find connection ID on BR/EDR am:
72b64d5302
am:
5f72f2a9bb
Change-Id: Ibd7ddeea4e795351baebc5405d1cdccfb15e0bac
OSDN Git Service
