OSDN Git Service
Patrick Tsai [Wed, 9 Mar 2016 19:31:43 +0000 (19:31 +0000)]
Merge "Fix build error caused by missing LOG_TAG"
am:
a34a404e3d
* commit '
a34a404e3d59b7c25a64471b4502f37c2c75d4de':
Fix build error caused by missing LOG_TAG
Patrick Tsai [Wed, 9 Mar 2016 19:31:43 +0000 (19:31 +0000)]
Merge "Add missing \'cd third_party\' step"
am:
8b1e8c3154
* commit '
8b1e8c3154884451a4d71db4583334ba1c09729b':
Add missing 'cd third_party' step
Jakub Pawlowski [Wed, 9 Mar 2016 19:31:42 +0000 (19:31 +0000)]
Add missing log tag
am:
85e22b32ec
* commit '
85e22b32ec3482a09dc019ee6fd096a31fd1bf64':
Add missing log tag
Jakub Pawlowski [Wed, 9 Mar 2016 19:25:45 +0000 (19:25 +0000)]
Merge "Fix build error caused by missing LOG_TAG"
Jakub Pawlowski [Wed, 9 Mar 2016 19:25:06 +0000 (19:25 +0000)]
Merge "Add missing 'cd third_party' step"
Jakub Pawlowski [Wed, 9 Mar 2016 19:22:00 +0000 (11:22 -0800)]
Add missing log tag
Change-Id: Icae6cf63de8d298fb12451887594abe24b026c77
Jakub Pawlowski [Wed, 9 Mar 2016 00:47:47 +0000 (00:47 +0000)]
Remove bta_gattc_id2handle
am:
14a73093ba
* commit '
14a73093ba78d237959f625fd27bd4edd9f0ff48':
Remove bta_gattc_id2handle
Jakub Pawlowski [Wed, 9 Mar 2016 00:47:43 +0000 (00:47 +0000)]
Use attribute handle instead of id in GATT cache
am:
bc5d65496d
* commit '
bc5d65496d7dc9d87d4fe3e3c92dadb043559786':
Use attribute handle instead of id in GATT cache
Jakub Pawlowski [Fri, 4 Mar 2016 19:46:08 +0000 (11:46 -0800)]
Remove bta_gattc_id2handle
Now that the instance id is equal to handle, we no longer need this
mapping function.
Bug:
27455533
Change-Id: I6760f8fc81460df8520d4ebf1899ed256ce5ad1e
Jakub Pawlowski [Wed, 2 Mar 2016 22:47:55 +0000 (14:47 -0800)]
Use attribute handle instead of id in GATT cache
Currently we generate an id for each GATT attribute. Those ids
are used to differentiate between attributes that have the same
UUID. We need to get rid of those ids because it won't work with
partial GATT database updates due to "service change"
notifications. Instead, attribute handles, which are unique
across the whole GATT database will be used.
This is first patch in series to achieve that. It gets rid
of id generation, and just assigns handle in place of ids inside
of gatt cache. Upcoming patches will change the GATT cache API
and eventually get rid of "id" completly.
Bug:
27455533
Change-Id: I74c10872ecc223329b8ac7fef4085963bf272624
Jakub Pawlowski [Tue, 8 Mar 2016 23:49:18 +0000 (23:49 +0000)]
HID multi-device refactoring
am:
22aaded594
* commit '
22aaded594fab42d5b30354a94c51d0b8666089b':
HID multi-device refactoring
venkata Jagadeesh [Tue, 8 Mar 2016 23:46:29 +0000 (23:46 +0000)]
SDP: Restrict attribute length to SDP_MAX_ATTR_LEN
am:
15b8ab4b33
* commit '
15b8ab4b338eed3fa35d8f4751eeab2a6cdcd3ef':
SDP: Restrict attribute length to SDP_MAX_ATTR_LEN
Jakub Pawlowski [Tue, 8 Mar 2016 20:36:46 +0000 (12:36 -0800)]
HID multi-device refactoring
We don't really support multiple HID services in same device.
We shouldn't use default value 0 for service id.
We shouldn't merge service id and characteristic id into one field,
as it's done not right right now.
Bug:
27455533
Change-Id: I46cc1b62bb2c7393e62f3b1a8e4650706954a066
venkata Jagadeesh [Tue, 15 Dec 2015 07:30:01 +0000 (13:00 +0530)]
SDP: Restrict attribute length to SDP_MAX_ATTR_LEN
Use case:
Bluetooth crash during the SNS testing.
Root Cause:
In sdpu_build_partial_attrib_entry there is no length check, it can
exceed the maximum allowable value and lead to a crash in memcpy.
Fix:
Restrict remaining attribute length to SDP_MAX_ATTR_LEN
in sdpu_build_partial_attrib_entry.
Change-Id: I5bde6868b82e50b3c09cf94277dabb4862f0a2a8
Marie Janssen [Tue, 8 Mar 2016 19:52:28 +0000 (19:52 +0000)]
bluetooth-cli: add support for --exec am:
5d80cb938d
am:
e228c9dbcd
* commit '
e228c9dbcd98a6bdfd972410d8eaeab885294acc':
bluetooth-cli: add support for --exec
Marie Janssen [Tue, 8 Mar 2016 19:50:27 +0000 (19:50 +0000)]
bluetooth-cli: add support for --exec
am:
5d80cb938d
* commit '
5d80cb938d7fb3312870a047749cc839ba5bafca':
bluetooth-cli: add support for --exec
Marie Janssen [Fri, 22 Jan 2016 02:45:53 +0000 (18:45 -0800)]
bluetooth-cli: add support for --exec
Adds the --exec and -e arguments, which execute commands when the
cli starts.
This also adds support for chaining commands at the command line by
separating them with ';' characters.
Change-Id: Ic2bf8a908fbb7fb4cf775810754571fa96d75e87
Dimitry Ivanov [Tue, 8 Mar 2016 19:42:24 +0000 (19:42 +0000)]
Dimitry Ivanov [Tue, 8 Mar 2016 19:32:56 +0000 (11:32 -0800)]
Fix the build
Change-Id: Ib226f087a76ddd426e40f4d6d94f2ed758660c36
Sanket Agarwal [Tue, 8 Mar 2016 19:16:08 +0000 (19:16 +0000)]
Move focus handling entirely to component calling fluoride.
am:
547b7b5257
* commit '
547b7b52578fddbd9e42ce1cc7e7bba9dded1d7d':
Move focus handling entirely to component calling fluoride.
Sanket Agarwal [Wed, 10 Feb 2016 23:24:09 +0000 (15:24 -0800)]
Move focus handling entirely to component calling fluoride.
Audio focus handling for A2DP sink currently split between Fluoride and
the component sitting on top of it. Since this is not the best place to
decide policies, we move all such decisions to the upper layer.
Bug: b/
26928143
Change-Id: I67a1a2a50782289e7e31447b01ee29a21bc8dac2
Jakub Pawlowski [Tue, 8 Mar 2016 04:15:42 +0000 (04:15 +0000)]
GATT cache storage refactoring am:
c10b209f62
am:
d7fba0cad0
* commit '
d7fba0cad007a5d31798983660b25b03e6794a49':
GATT cache storage refactoring
Pavlin Radoslavov [Tue, 8 Mar 2016 04:15:30 +0000 (04:15 +0000)]
Ignore LCB entries that migth have been released while queued am:
fb2105f348
am:
64a81c78c5
* commit '
64a81c78c58dfe165ee4de77b7694bde8a86f48e':
Ignore LCB entries that migth have been released while queued
Jakub Pawlowski [Tue, 8 Mar 2016 03:04:34 +0000 (03:04 +0000)]
GATT cache storage refactoring
am:
c10b209f62
* commit '
c10b209f62a52d2a782d4d8c97734b6c142f2567':
GATT cache storage refactoring
Pavlin Radoslavov [Tue, 8 Mar 2016 02:11:32 +0000 (02:11 +0000)]
Ignore LCB entries that migth have been released while queued
am:
0c33fde894
* commit '
0c33fde894b566484b9956560e8b701b82fa04cc':
Ignore LCB entries that migth have been released while queued
Jakub Pawlowski [Sun, 6 Mar 2016 01:57:51 +0000 (17:57 -0800)]
GATT cache storage refactoring
Currently when storing GATT cache into file, we save it piece
after piece, max 10 elements at once. This is not necessary,
we have enough space to just save all at once.
Also the logic doesn't need to be so complicated - no need
to state machine for such simple task.
Bug:
27455533
Change-Id: I82923dbedfb317835e45e13e0ea28151eb524d37
Pavlin Radoslavov [Tue, 1 Mar 2016 21:32:41 +0000 (13:32 -0800)]
Ignore LCB entries that migth have been released while queued
Function btm_send_pending_direct_conn() dequeues tL2C_LCB
entries from the conn_pending_q queue and calls the processing
function.
However, there is the possilility of a race condition
and releasing the entry by l2cu_release_lcb() before it is processed.
Now tL2C_LCB that are not in_use are ignored.
Bug:
27418154
Change-Id: I4b5fda605a60c8aebbf5587bb12dd74ac5d28f68
Pavlin Radoslavov [Mon, 7 Mar 2016 21:05:23 +0000 (21:05 +0000)]
Ignore LCB entries that migth have been released while queued
am:
fb2105f348
* commit '
fb2105f3488e48f2d908b13a33f47e34f6e3f78d':
Ignore LCB entries that migth have been released while queued
Pavlin Radoslavov [Tue, 1 Mar 2016 21:32:41 +0000 (13:32 -0800)]
Ignore LCB entries that migth have been released while queued
Function btm_send_pending_direct_conn() dequeues tL2C_LCB
entries from the conn_pending_q queue and calls the processing
function.
However, there is the possilility of a race condition
and releasing the entry by l2cu_release_lcb() before it is processed.
Now tL2C_LCB that are not in_use are ignored.
Bug:
27418154
Change-Id: I4b5fda605a60c8aebbf5587bb12dd74ac5d28f68
Patrick Tsai [Sun, 6 Mar 2016 09:42:19 +0000 (01:42 -0800)]
Fix build error caused by missing LOG_TAG
FAILED: gcc -MMD -MF obj/hci/src/libhci.hci_packet_parser.o.d -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -DHAS_NO_BDROID_BUILDCFG -DLOG_NDEBUG=1 -DEXPORT_SYMBOL=__attribute__\(\(visibility\(\"default\"\)\)\) -DKERNEL_MISSING_CLOCK_BOOTTIME_ALARM=TRUE -DOS_GENERIC -I../../hci/include -I../.. -I../../include -I../../bta/include -I../../btcore/include -I../../stack/include -I/home/patrick/src/fluoride/libhardware/include -I/home/patrick/src/fluoride/core/include -I/home/patrick/src/fluoride/media/audio/include -g -O0 -fpic -fdata-sections -ffunction-sections -fvisibility=hidden -std=c99 -c ../../hci/src/hci_packet_parser.c -o obj/hci/src/libhci.hci_packet_parser.o
In file included from ../../hci/src/hci_packet_parser.c:28:0:
../../hci/src/hci_packet_parser.c: In function ‘read_command_complete_header’:
../../hci/src/hci_packet_parser.c:239:43: error: expected ‘)’ before ‘__func__’
LOG_ERROR("%s: return status - 0x%x", __func__, status);
Change-Id: I6ca721ba24ba3170d701f606f0676c5c4e707cf8
Patrick Tsai [Sun, 6 Mar 2016 08:35:09 +0000 (00:35 -0800)]
Add missing 'cd third_party' step
Subramanian Srinivasan [Fri, 4 Mar 2016 22:04:28 +0000 (22:04 +0000)]
Update device type in NVRAM correctly during inquiry am:
ab7418f58c
am:
68bb3ecf9c
* commit '
68bb3ecf9ca7bf59694193e3a8a4b1efe76a47ad':
Update device type in NVRAM correctly during inquiry
Subramanian Srinivasan [Fri, 4 Mar 2016 22:02:25 +0000 (22:02 +0000)]
Update device type in NVRAM correctly during inquiry
am:
ab7418f58c
* commit '
ab7418f58c84216d57b7c0d553f09f5748badd82':
Update device type in NVRAM correctly during inquiry
Jacky Cheung [Fri, 4 Mar 2016 22:00:32 +0000 (22:00 +0000)]
Default missing DevType and DevClass in NVRAM. am:
3b6ef54cd2
am:
4b8cdc78d4
* commit '
4b8cdc78d4d665dafc7903877cb7c362807ec782':
Default missing DevType and DevClass in NVRAM.
venkata Jagadeesh [Fri, 4 Mar 2016 22:00:24 +0000 (22:00 +0000)]
GATT: Initiate L2CAP disconnect only when the channel is open am:
bf955cb7e5
am:
e65e09f115
* commit '
e65e09f11598af404915111cf3b027c6d5890081':
GATT: Initiate L2CAP disconnect only when the channel is open
Subramanian Srinivasan [Thu, 23 Jul 2015 22:05:05 +0000 (15:05 -0700)]
Update device type in NVRAM correctly during inquiry
If the NVRAM device type for a device is not dual mode and the inquiry
result is received for BLE or BR/EDR transport, then this patch updates
the NVRAM device type to dual mode.
Change-Id: I688e7c5e3bd8d844288d095cb97c2e55ddf652c6
Jacky Cheung [Fri, 4 Mar 2016 21:58:32 +0000 (21:58 +0000)]
Default missing DevType and DevClass in NVRAM.
am:
3b6ef54cd2
* commit '
3b6ef54cd262da6a41a16dafe361040740024717':
Default missing DevType and DevClass in NVRAM.
venkata Jagadeesh [Fri, 4 Mar 2016 21:58:28 +0000 (21:58 +0000)]
GATT: Initiate L2CAP disconnect only when the channel is open
am:
bf955cb7e5
* commit '
bf955cb7e50e1047452e741effa504c8aefc8a4f':
GATT: Initiate L2CAP disconnect only when the channel is open
Jacky Cheung [Fri, 4 Mar 2016 21:29:02 +0000 (13:29 -0800)]
Default missing DevType and DevClass in NVRAM.
Missing DevType and DevClass in NVRAM were not properly set to a
default values previously.
Jakub Pawlowski [Fri, 4 Mar 2016 21:52:25 +0000 (21:52 +0000)]
Remove btla-specific comments am:
1be7ae1a08
am:
a9b36318f2
* commit '
a9b36318f287a1a3ef4a8dc253b4313dadf00721':
Remove btla-specific comments
venkata Jagadeesh [Thu, 26 Nov 2015 08:44:00 +0000 (14:14 +0530)]
GATT: Initiate L2CAP disconnect only when the channel is open
Use case:
Crash found during L2CAP disconnect from faulty BLE APP.
Steps:
Run SNS testing.
Failure:
Crash during L2CAP disc.
Root cause:
Faulty BLE application triggering GATT disconnection
which internally triggering L2CAP disconnection without checking
proper state of channel.
Fix:
- Initiate L2CAP disconnect only when the channel is open
- Validate LCB during disconnection from upper layers
Change-Id: Ic9d065f095feba659c861828732647e968c20db8
Jakub Pawlowski [Fri, 4 Mar 2016 21:50:24 +0000 (21:50 +0000)]
Remove btla-specific comments
am:
1be7ae1a08
* commit '
1be7ae1a0890380b8a3daebcade0c1f55b04b167':
Remove btla-specific comments
Jakub Pawlowski [Fri, 4 Mar 2016 21:20:05 +0000 (13:20 -0800)]
Remove btla-specific comments
Change-Id: I91a19b2cfbc96d7567e0e0914058619ea364c1d4
Matadeen Mishra [Fri, 4 Mar 2016 19:38:41 +0000 (19:38 +0000)]
Correcting sniff behaviour in multi-connection scenario am:
31d1a2b525
am:
060b3c2007
* commit '
060b3c20079e84ee8de4ab44663a4dd3f4fa9be7':
Correcting sniff behaviour in multi-connection scenario
Matadeen Mishra [Fri, 4 Mar 2016 19:36:09 +0000 (19:36 +0000)]
Correcting sniff behaviour in multi-connection scenario
am:
31d1a2b525
* commit '
31d1a2b52507df33f13d19ed2349585dfa490542':
Correcting sniff behaviour in multi-connection scenario
Matadeen Mishra [Mon, 1 Feb 2016 13:50:54 +0000 (19:20 +0530)]
Correcting sniff behaviour in multi-connection scenario
Use case: When multiple profiles are connected on same link and if any one of the
profiles deregisters with powermanager, powermanager will initiate a sniff when it
removes the timer for one profile, even if a timeout did not trigger for other profiles.
Steps:
1. Turn on BT
2. Pair with Mi band (Wearable device)
3. Pair with carkit
4. Turn off BT
5. Turn on BT
HF and A2DP connection should successful after BT on to carkit.
Failure: HF connection fails.
Root Cause: powermanager initiates a sniff when it removes the timer for one profile
Even if a timeout did not trigger for other profiles.
Fix: When multiple profiles connect on the same link and if any one profile
deregisters with powermanager, pm should stop the timer for that profile
and restart the other profiles timers.
Change-Id: I8e215a9d868291976c70ff32b61145b4360a7f8f
Srinu Jella [Fri, 4 Mar 2016 19:14:48 +0000 (19:14 +0000)]
Cleanup L2CAP socket properly on close am:
9123096530
am:
1c42c2314b
* commit '
1c42c2314ba17f8d7ffce5dc511a245e5acf3627':
Cleanup L2CAP socket properly on close
Srinu Jella [Fri, 4 Mar 2016 19:12:48 +0000 (19:12 +0000)]
Cleanup L2CAP socket properly on close
am:
9123096530
* commit '
91230965304bc323a96ced0527d560aacb606415':
Cleanup L2CAP socket properly on close
Srinu Jella [Mon, 21 Sep 2015 06:30:48 +0000 (12:00 +0530)]
Cleanup L2CAP socket properly on close
Use case:
1. Sometimes pairing pop up occurs during Android beam
transfer though it is not required.
2. No OPP Tx request over OBEX if we cancel during file transfer.
Precondition
1. WIFI ON and conneted with AP.
Steps:
1. Pair and connect from DUT to remote.
2. Go to gallery and send a file.
3. Accept same file and stop it from remote during transfer.
4. Repeat step 2-4 10 times.
Failure:
OPP Tx should not fail.
Root cause:
Close request was not properly handled from BT-IF layer.
Fix:
1. Handled the close request properly from BT-IF layer
to close the socket variables and instruct the BTA layer
close from there as well.
2. Clean up L2CAP socket properly on closure to free
the entry registered with security manager to avoid
leak in security manager records.
Change-Id: I4f5d6ac92317bcaee5f9285ba71d13eea84c737c
Balraj Selvaraj [Fri, 4 Mar 2016 19:04:50 +0000 (19:04 +0000)]
GAP Setting remove device pending status as FALSE am:
9412bbaea5
am:
d58b657e22
* commit '
d58b657e22dc3aa5facfaff8524e950665c71985':
GAP Setting remove device pending status as FALSE
Balraj Selvaraj [Fri, 4 Mar 2016 19:02:47 +0000 (19:02 +0000)]
GAP Setting remove device pending status as FALSE
am:
9412bbaea5
* commit '
9412bbaea51f577d903e060b8c8214fbd28b0b4f':
GAP Setting remove device pending status as FALSE
Balraj Selvaraj [Thu, 11 Feb 2016 08:16:02 +0000 (13:46 +0530)]
GAP Setting remove device pending status as FALSE
Use case: DUT deletes Link key and failed to initiate
authentication request after remote headset turned Off and ON
steps:
- Pair the DUT and HS. (Link Keys get established.)
- Now Switch OFF BT on DUT. (DUT still has the Link key of HS)
- Reset the paired devices memory in HS and keep HS in
pairing mode. (HS loses DUT's link key)
- Now switch ON BT on DUT. (DUT starts reconnection with HS,
but as HS lost DUT's key, PIN or KEY missing event will
come to host)
- DUT reconnects to HS (Using newly established link keys)
- Now power OFF and ON the HS.
- HS will try reconnection with DUT.
- While there is an incoming connection from HS to DUT,
host is giving negative link key reply always for the
multiple link key requests from HS.
- HS sends disconnection with "Authentication failure"
Failure: DUT should not delete Link key and DUT should
initiate Authenticatin request.
Root cause: pending status was not FALSE from security device
DB, which will causing Authentication Failure.
Fix: Setting the remove device pending status to FALSE from
security device DB, when the link key notification event
comes. Basically it will avoid deleting the device from
security device DB, Which is solving the reconnection
initated from remote when we remove the link key at
remote side.
Change-Id: Ic164d8d5b5c2e0b9cc5f04f993047fb0a8e5d9a9
Srinu Jella [Fri, 4 Mar 2016 18:50:22 +0000 (18:50 +0000)]
Track TX empty event to manage sniff timer am:
4e972d8c24
am:
09f045bdbc
* commit '
09f045bdbcc1d36abc73bd8ec882b13c03c2226e':
Track TX empty event to manage sniff timer
Srinu Jella [Fri, 4 Mar 2016 18:48:22 +0000 (18:48 +0000)]
Track TX empty event to manage sniff timer
am:
4e972d8c24
* commit '
4e972d8c24ecfb808757ef5c81eb3877ebc93027':
Track TX empty event to manage sniff timer
Srinu Jella [Tue, 16 Feb 2016 14:52:16 +0000 (20:22 +0530)]
Track TX empty event to manage sniff timer
Use case:
OPP TX while inquiry is in progress.
Steps:
1. Send any file from DUT to remote using BT.
2. Accept file on remote.
3. During file transfer, start inquiry on DUT and
observe behaviour.
Failure:
DUT sends sniff command in the middle of the transfer
though it is not required. eventually OPP Tx over
L2CAP file transfer fail.
Root Cause:
As per the current implementation, for tx it will
immediately starts idle timer without checking
for the completion status of tx.
Fix:
Handled the tx complete event from L2CAP properly
to start the idle timer to manage the sniff properly.
Change-Id: I298075590042e82a2f33837f6df6af0b2fd8179a
Srinu Jella [Fri, 4 Mar 2016 18:38:35 +0000 (18:38 +0000)]
Read local supported codecs as part of boot sequence am:
f6dcf79f62
am:
99a2b14ab4
* commit '
99a2b14ab44b388499b0d084265c8b4a21caac39':
Read local supported codecs as part of boot sequence
Srinu Jella [Fri, 4 Mar 2016 18:36:36 +0000 (18:36 +0000)]
Read local supported codecs as part of boot sequence
am:
f6dcf79f62
* commit '
f6dcf79f62880e716e127b19c70ea328e07c6051':
Read local supported codecs as part of boot sequence
Srinu Jella [Wed, 22 Jul 2015 12:00:32 +0000 (17:30 +0530)]
Read local supported codecs as part of boot sequence
Add support to read local supported codecs as part of
controller module initialization.
Also added an API from controller interface to get the
local supported codecs.
Change-Id: I37a4ab9e6a20ed057ca794dbdd4f99c2a8c65a6e
Srinu Jella [Fri, 4 Mar 2016 18:28:33 +0000 (18:28 +0000)]
Added fd for monitoring when the channel is not congested am:
7baa1e1792
am:
3cc1abb802
* commit '
3cc1abb8029acabfe81ee109e95b16365f609577':
Added fd for monitoring when the channel is not congested
Srinu Jella [Fri, 4 Mar 2016 18:26:34 +0000 (18:26 +0000)]
Added fd for monitoring when the channel is not congested
am:
7baa1e1792
* commit '
7baa1e17924cdac702ab9d8146a966fbd26c8d50':
Added fd for monitoring when the channel is not congested
Srinu Jella [Tue, 11 Aug 2015 13:46:52 +0000 (19:16 +0530)]
Added fd for monitoring when the channel is not congested
Use case:
Skips and Media Audio Loss are Observed During PAN Connection
Steps:
1. Launched Local Music and Media Audio was in Headset.
2. Paired and Connected to other Phone to DUT Over BT Tethering.
3. While Listening to Media Audio in DUT, Started Watching
Youtube in other phone.
4. Observed Below Observations During Some 30mins of PAN Connection.
Failure:
Skips and Media Audio Loss are Observed During PAN Connection
Root Cause:
socket monitor thread keeps polling for PAN fd, eventually
it will make the BTU thread also busy, inturn NOCP processing
gets delayed.
Fix:
Add PAN fd for monitoring only when L2CAP channel related to
PAN profile is not congested. It will break loop by checking the
congestion status to put the fd for polling.
Change-Id: I2119c6c86d8e4798e516c512ad7aac7630b85a6a
Matadeen Mishra [Fri, 4 Mar 2016 18:16:21 +0000 (18:16 +0000)]
Merge "Shorten local name in EIR data according to UTF encoding rules" am:
a9644b77b7
am:
ea75e89bbd
* commit '
ea75e89bbd89bc4367a599d8c033ce4cafde03d9':
Shorten local name in EIR data according to UTF encoding rules
Matadeen Mishra [Fri, 4 Mar 2016 18:14:22 +0000 (18:14 +0000)]
Merge "Shorten local name in EIR data according to UTF encoding rules"
am:
a9644b77b7
* commit '
a9644b77b7959fef0b58410230930317575d0668':
Shorten local name in EIR data according to UTF encoding rules
Andre Eisenbach [Fri, 4 Mar 2016 18:08:00 +0000 (18:08 +0000)]
Merge "Shorten local name in EIR data according to UTF encoding rules"
Hemant Gupta [Fri, 4 Mar 2016 17:46:00 +0000 (17:46 +0000)]
HID: Handle collisions during incoming and outgoing connections am:
891723a428
am:
852ab5f88b
* commit '
852ab5f88b8c67d79fab181fd3a1d0de724ffefb':
HID: Handle collisions during incoming and outgoing connections
Hemant Gupta [Fri, 4 Mar 2016 17:44:01 +0000 (17:44 +0000)]
HID: Handle collisions during incoming and outgoing connections
am:
891723a428
* commit '
891723a42851285ec7e6c2f616a405611789da6b':
HID: Handle collisions during incoming and outgoing connections
Hemant Gupta [Fri, 4 Mar 2016 17:39:41 +0000 (17:39 +0000)]
HID: Reset outgoing connection retry to 1 am:
b7d4613b3c
am:
95d3d43169
* commit '
95d3d431693134fc4ff71aa1ce7f7a9086964b74':
HID: Reset outgoing connection retry to 1
Hemant Gupta [Fri, 11 Dec 2015 14:39:22 +0000 (20:09 +0530)]
HID: Handle collisions during incoming and outgoing connections
- This patch handles cases when incoming HID connection is in progress, and
there is an outgoing connection attempt from upper layers. This was leading
to a case when ougoing connection would fail as connection was already in
progress, which triggered cleanup of connection states, which was not proper
leading to issues in future connection attempts, as disconnection during
ongoing connection was not handled properly in existing code.
- Reset the incoming flags during open failure to prevent any possible issues
during further outgoing connections.
Change-Id: I6fb0c6156482d2da41ca0d2d280091d73c27f292
Hemant Gupta [Fri, 4 Mar 2016 17:37:40 +0000 (17:37 +0000)]
HID: Reset outgoing connection retry to 1
am:
b7d4613b3c
* commit '
b7d4613b3c1fae825b4c7ba94907c75513feb1c7':
HID: Reset outgoing connection retry to 1
Hemant Gupta [Fri, 4 Mar 2016 17:35:38 +0000 (17:35 +0000)]
HID: Remove bond for device in case Virtual unplug is ongoing am:
dc5272a39d
am:
6305a70e15
* commit '
6305a70e15fac8bf1088a358b62f9910d293e420':
HID: Remove bond for device in case Virtual unplug is ongoing
Hemant Gupta [Fri, 4 Mar 2016 17:19:55 +0000 (22:49 +0530)]
HID: Reset outgoing connection retry to 1
Reduce the retry time from host to 1 from 3 to prevent collision scenarios
when remote also tries to connect which could lead to potential authentication
issues in SoC.
Change-Id: I3b5db4a4c4aa985cb9c0537499ce608f9e5d5522
Hemant Gupta [Fri, 4 Mar 2016 17:33:38 +0000 (17:33 +0000)]
HID: Remove bond for device in case Virtual unplug is ongoing
am:
dc5272a39d
* commit '
dc5272a39d7915d0c921de2fb0727853fadda40a':
HID: Remove bond for device in case Virtual unplug is ongoing
Hemant Gupta [Fri, 11 Dec 2015 10:17:45 +0000 (15:47 +0530)]
HID: Remove bond for device in case Virtual unplug is ongoing
Remove bond for remote device in case virtual unplug was initiated from
local device, and ACL got disconnected while processing the VUP request.
this can happen when aaplication is sending disconnect and remove bond
in quick succession. Without this fix it was observed that device was
getting disconnected, but was not getting unpaired even when user
tried to unpair from UI.
Change-Id: Ife1fc99ed59b13daf0bcf0dce3e0a59c7d9e87d7
Matadeen Mishra [Wed, 3 Feb 2016 15:20:31 +0000 (20:50 +0530)]
Shorten local name in EIR data according to UTF encoding rules
Use case:
Test short name after setting the name with maximum length
Steps to reproduce:
1) Phone A: Rename bluetooth into a 60 character Chinese name
2) Phone B: Discover phone A.
3) The short name of phone A will display in phone B and the short
name cantains unrecognizable chars.
Root cause:
As Chinese characters are encoded in different
length in UTF, if shorten BT name in fixed length,
there will be unrecognized characters
Fix:
Shorten BT name according to UTF encoding rule and decrease
the length.
Change-Id: I5f1e49c1b5d87d5e220538c90e297c50ccc790ff
Subramanian Srinivasan [Fri, 4 Mar 2016 07:49:17 +0000 (07:49 +0000)]
Use correct transport type for GATT client and server connections am:
d27af38849
am:
001439c495
* commit '
001439c495cc49960e83e5d039586f461762bb8d':
Use correct transport type for GATT client and server connections
Subramanian Srinivasan [Fri, 4 Mar 2016 07:47:20 +0000 (07:47 +0000)]
Use correct transport type for GATT client and server connections
am:
d27af38849
* commit '
d27af388490dbe194035ad779096f98aef92d1a5':
Use correct transport type for GATT client and server connections
Subramanian Srinivasan [Thu, 29 Oct 2015 00:05:22 +0000 (17:05 -0700)]
Use correct transport type for GATT client and server connections
Use correct transport type for GATT client and server connect
API calls. This change uses the transport used while calling
the connect frameworks API instead of relying on the NVRAM to
find the transport on which the connect call needs to be sent
to the BT stack.
Change-Id: Idf5817b8980e848c6ebebf1e9a79dbce61d8cfc8
Pavlin Radoslavov [Fri, 4 Mar 2016 07:28:17 +0000 (07:28 +0000)]
Remove MCB from mapping table when entry is released
am:
8cbd6d6081
* commit '
8cbd6d60819ab10d3a27d6dfa14755976e1b552a':
Remove MCB from mapping table when entry is released
Satya Calloji [Fri, 4 Mar 2016 07:20:27 +0000 (07:20 +0000)]
Update OCF values per 0.96 spec am:
ca58b09a91
am:
e6e2ad6c41
* commit '
e6e2ad6c41b60c539b7b89a584ef06f768c8fba5':
Update OCF values per 0.96 spec
Satya Calloji [Fri, 4 Mar 2016 07:18:33 +0000 (07:18 +0000)]
Update OCF values per 0.96 spec
am:
ca58b09a91
* commit '
ca58b09a9129e334f116b7bbdfc0a3834afa299e':
Update OCF values per 0.96 spec
Eri Kasamatsu [Fri, 4 Mar 2016 07:16:35 +0000 (07:16 +0000)]
OCF for LE Extended Set Scan Parameters Cmd is not correct am:
b67ada19a7
am:
24d8dab56c
* commit '
24d8dab56c0916f0abe2d0d8035fa4add8df4e15':
OCF for LE Extended Set Scan Parameters Cmd is not correct
Satya Calloji [Wed, 2 Mar 2016 19:25:49 +0000 (11:25 -0800)]
Update OCF values per 0.96 spec
HCI command values are updated as per Google HCI
BLE requirements v0.96
Bug:
27069512
Change-Id: I30e0046c5d3198f0986e03baf697bad2be99c06e
Eri Kasamatsu [Fri, 4 Mar 2016 07:14:43 +0000 (07:14 +0000)]
OCF for LE Extended Set Scan Parameters Cmd is not correct
am:
b67ada19a7
* commit '
b67ada19a7235552c802d3dccca011245379b6d5':
OCF for LE Extended Set Scan Parameters Cmd is not correct
Eri Kasamatsu [Tue, 9 Feb 2016 14:11:51 +0000 (15:11 +0100)]
OCF for LE Extended Set Scan Parameters Cmd is not correct
OCF for LE Extended Set Scan Paramaters Cmd is defined as 0x15A
in documentation but it is defined as 0x160 in stack.
This results in command failing due to unknown hci command error.
Change-Id: Ia779164b7c03daa8053fb65e4fc8281235904031
Satish Kodishala [Fri, 4 Mar 2016 07:05:00 +0000 (07:05 +0000)]
Handle unknown codecs sent by HF am:
dccd759e2e
am:
cea55c8886
* commit '
cea55c888662fa0a7a29878dda31e0f905bd892a':
Handle unknown codecs sent by HF
Satish Kodishala [Fri, 4 Mar 2016 07:03:03 +0000 (07:03 +0000)]
Handle unknown codecs sent by HF
am:
dccd759e2e
* commit '
dccd759e2ebb0c348d739e32599e50b419bcf7bc':
Handle unknown codecs sent by HF
Satish Kodishala [Thu, 25 Jun 2015 07:48:35 +0000 (13:18 +0530)]
Handle unknown codecs sent by HF
Use case:
1. Connect to headset supporting CVSD, mSBC and other codecs.
2. Verify if headset sending AT+BAC with supported codecs.
3. Check if SCO is established with mSBC codec.
Failure:
SCO is established with CVSD codec.
Root cause:
When parsing AT+BAC command, if unknown codec is received,
we are falling back to CVSD although mSBC is supported in HF.
Fix:
AT+BAC parsing function modified to return correct codecs
supported by HF when it encounters unknown codecs in arguments
of AT+BAC.
Change-Id: I9ac7675c9d863e7362f85e3b7b8d9a42462bd5e9
Srinu Jella [Fri, 4 Mar 2016 06:59:06 +0000 (06:59 +0000)]
Avoid double-free on SDP search failure am:
07f612cbc0
am:
c1d8b25a89
* commit '
c1d8b25a89d9e57e2104b07fcea7991ec7c1f4b7':
Avoid double-free on SDP search failure
Srinu Jella [Fri, 4 Mar 2016 06:57:13 +0000 (06:57 +0000)]
Avoid double-free on SDP search failure
am:
07f612cbc0
* commit '
07f612cbc08364a622e6e02cdbb039b82586d82c':
Avoid double-free on SDP search failure
Srinu Jella [Tue, 29 Dec 2015 08:00:19 +0000 (13:30 +0530)]
Avoid double-free on SDP search failure
Use case: BT transfer fails in Doze mode.
Pre-condition:
1. Device is in Doze mode.
2. Device is in Active state.
Steps to reproduce:
1. On test device and support device, turn on Bluetooth and keep test device in Bluetooth on screen.
2. Put device in Doze mode:
adb shell dumpsys battery unplug
adb shell dumpsys deviceidle step
3. From support device send pair request to test device.
4. Pair two devices.
5. Put test device in Doze mode again.
6. Share one picture from support device to test device by Bluetooth.
7. Accept Bluetooth file transferring request.
Failure: From DUT, BT transfer is failed.
Root cause: Free buffer is called twice for the SDP search failure case.
Fix: Added null check for p_sdp_db to avoid freeing same buffer
again on SDP search failure.
Change-Id: Ic7776e842c52418c2b0fb6d6479233d01c709dc2
Andre Eisenbach [Fri, 4 Mar 2016 06:43:41 +0000 (06:43 +0000)]
Remove bluedroidtest am:
cd0199a20b
am:
6f8588d6ad
* commit '
6f8588d6ad8fdad56561cd19872684164736348b':
Remove bluedroidtest
Andre Eisenbach [Fri, 4 Mar 2016 06:41:45 +0000 (06:41 +0000)]
Remove bluedroidtest
am:
cd0199a20b
* commit '
cd0199a20b48fcb191f3178a28a6a503e28b7685':
Remove bluedroidtest
Sharvil Nanavati [Fri, 4 Mar 2016 06:39:42 +0000 (06:39 +0000)]
Delete unused function declarations from sdp_api.h. am:
5c35aa44a2
am:
1d17241105
* commit '
1d17241105ee43d953cdd43b97ce4b476421a36f':
Delete unused function declarations from sdp_api.h.
Andre Eisenbach [Fri, 4 Mar 2016 06:36:51 +0000 (22:36 -0800)]
Remove bluedroidtest
Use bluetooth-cli/bluetoothtbd instead.
Bug:
25369253
Change-Id: I485919dce4bf3229733c85e6a33c754b9cbd62fc
Sharvil Nanavati [Fri, 4 Mar 2016 06:37:49 +0000 (06:37 +0000)]
Delete unused function declarations from sdp_api.h.
am:
5c35aa44a2
* commit '
5c35aa44a2d92185d9eee51781f2522773607986':
Delete unused function declarations from sdp_api.h.
Sharvil Nanavati [Thu, 11 Jun 2015 06:20:24 +0000 (23:20 -0700)]
Delete unused function declarations from sdp_api.h.
Change-Id: I8db02d557fdfc138f2ec8de2b2d45049175fd999
Pavlin Radoslavov [Thu, 3 Mar 2016 21:16:45 +0000 (13:16 -0800)]
Remove MCB from mapping table when entry is released
Explicitly remove MCB entry from the LCB mapping table when
the entry is released.
Bug:
27334916
Change-Id: I14e3f1f5eeffa33e733c4a116d0a70cd7c06753f
Nitin Arora [Fri, 4 Mar 2016 00:55:20 +0000 (00:55 +0000)]
Avoid SMP process if another pairing is in progress am:
0bb891dc54
am:
e058c1eede
* commit '
e058c1eedebd2b42a774f1f9a39063b670905131':
Avoid SMP process if another pairing is in progress
Pavlin Radoslavov [Fri, 4 Mar 2016 00:55:15 +0000 (00:55 +0000)]
Remove MCB from mapping table when entry is released am:
5170c746e5
am:
2de277c6fa
* commit '
2de277c6fadef8048f14bc655092920de503ed56':
Remove MCB from mapping table when entry is released
Jakub Pawlowski [Fri, 4 Mar 2016 00:55:07 +0000 (00:55 +0000)]
Remove dead methods and callbacks am:
ee6b6d0965
am:
40d3f390c7
* commit '
40d3f390c75353d5c08e19e658be87e90803ff27':
Remove dead methods and callbacks