OSDN Git Service
Mike J. Chen [Fri, 31 Jan 2014 23:25:12 +0000 (15:25 -0800)]
Fix warning "suggest braces around empty body in an 'if' statement"
The body of an if statement could become empty if the macro body
is NULL and cause the if to apply to the next line instead.
Change-Id: I0bea6a46f29bc2c4dfc6e1fa13dd35b094310294
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mike J. Chen [Fri, 31 Jan 2014 23:14:08 +0000 (15:14 -0800)]
Fix warning "comparison is always true due to limited range of data type"
Change-Id: I1d59e67f507e676513aa006f265cca9179b7c2fe
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mike J. Chen [Fri, 31 Jan 2014 23:13:24 +0000 (15:13 -0800)]
Add a function prototype for btm_ble_test_command_complete
To fix warning about implicit declaration when compiling btu_hcif.c
Change-Id: Ia07ae3036c65928b6981becb12e18115f0af7769
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mike J. Chen [Fri, 31 Jan 2014 23:06:49 +0000 (15:06 -0800)]
Change argument to return ptr rather than assign to unused local
There was a warning about local variable assigned but not used.
I believe this was actually an implementation and API problem.
The function is called "btm_sec_find_bonded_dev" and returns
a BOOLEAN about whether the search succeeded or not. I believe
it should also return a pointer to the dev rec if the search
succeeded, but due to an API definition error, it was just
assigning a local rather than returning the pointer ot the rec.
Also add to btm_int.h a function prototype that was missing
and causing a warning about implicit declaration.
Change-Id: Ifcef3afe3acbe12f4c69472fcedd01b268f644dd
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mike J. Chen [Fri, 31 Jan 2014 23:06:22 +0000 (15:06 -0800)]
Fix warning "comparison is always true due to limited range of data type"
Change-Id: I191b4c12ea6d4ed7a898b158d2ae26fffdeb471f
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mike J. Chen [Fri, 31 Jan 2014 23:04:41 +0000 (15:04 -0800)]
Fix warnings about implicit declarations
Two functions were used without including header file
and generating following warnings:
implicit declaration of function 'bta_sys_add_uuid'
implicit declaration of function 'bta_sys_remove_uuid'
Change-Id: I1c36fda7af9e838259b93bd2a29e3547d9df0eb5
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mike J. Chen [Fri, 31 Jan 2014 23:03:44 +0000 (15:03 -0800)]
Fix warning "implicit declaration of function 'bdcmp'"
Change-Id: Ifc13cfa4b88d8483c58dd955ea69f482b06ec79a
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mike J. Chen [Fri, 31 Jan 2014 23:02:31 +0000 (15:02 -0800)]
Fix warning "case label value exceeds maximum value for type"
Change-Id: I1f8ef599b0d64aafe37d3422a8b43cc66ef0e6fe
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mike J. Chen [Fri, 31 Jan 2014 21:28:58 +0000 (13:28 -0800)]
Fix missing initializer warning
Change-Id: I13e96a25b66a0a789d1adab9e41f2315d294943d
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mike J. Chen [Fri, 31 Jan 2014 21:26:56 +0000 (13:26 -0800)]
Fix missing initializer warning
Change-Id: Id578a65e05a4ec0416940efdb4de2c758ca90206
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mike J. Chen [Fri, 31 Jan 2014 21:24:49 +0000 (13:24 -0800)]
Fix warning about missing initializer
Change-Id: Ifbee10f3de140d51b42a915cb532b58ea67c66cc
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mike J. Chen [Tue, 28 Jan 2014 20:40:47 +0000 (20:40 +0000)]
Merge "Fix HID get_report callback support" into klp-modular-dev
Matthew Xie [Tue, 28 Jan 2014 20:37:33 +0000 (20:37 +0000)]
am
a94ee494: Merge "Fix calls to pthread_setschedparam."
* commit '
a94ee49440718e45147b6b6c26b44dd81d11e1c9':
Fix calls to pthread_setschedparam.
Matthew Xie [Tue, 28 Jan 2014 20:27:06 +0000 (20:27 +0000)]
Merge "Fix calls to pthread_setschedparam."
Mike J. Chen [Fri, 24 Jan 2014 01:56:18 +0000 (17:56 -0800)]
Fix HID get_report callback support
There were multiple bugs in the code for get_report event
callback handling:
1) the p_dev lookup was using the wrong argument so was coming
up with NULL ptr and passing it through to the callback
2) the BT_HDR * was being passed to the callback instead of a
ptr to the payload
3) the size was being passed as a constant BT_HDR_SIZE.
It looked like this code was expecting the callback to parse
the BT_HDR, but that's an internal bluedroid structure.
The callback is defined as receiving the report data and the
report data size, which this change now provides.
Note that the payload might be NULL if the device returns
a HANDSHAKE error msg instead, and so it is valid to pass
the callback a NULL payload ptr and a 0 size.
Change-Id: I462b5cb5d4c460af085dc6e15f59c778a020a80e
Signed-off-by: Mike J. Chen <mjchen@google.com>
Colin Cross [Tue, 28 Jan 2014 01:03:03 +0000 (01:03 +0000)]
am
32d2c034: Merge "external/bluetooth/bluedroid: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit '
32d2c03471edb78df635a05bb5bbdc27e9f0e4e1':
external/bluetooth/bluedroid: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
Colin Cross [Tue, 28 Jan 2014 00:47:42 +0000 (00:47 +0000)]
Merge "external/bluetooth/bluedroid: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
Colin Cross [Sat, 25 Jan 2014 05:00:32 +0000 (21:00 -0800)]
external/bluetooth/bluedroid: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it
with LOCAL_MODULE_RELATIVE_PATH.
Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
Sharvil Nanavati [Wed, 22 Jan 2014 08:04:45 +0000 (00:04 -0800)]
Fix calls to pthread_setschedparam.
When the scheduling priority is set to SCHED_NORMAL, you may not
specify a non-zero priority. The current implementation does
exactly that resulting in the call failing and returning EINVAL.
This change ensures that a priority of 0 is set when the desired
scheduler policy is set to SCHED_NORMAL.
http://b/
12304174
Change-Id: I945cae175b7bdd29dd8fc130ff6396b88ec33fcb
Zhihai Xu [Tue, 7 Jan 2014 19:16:27 +0000 (19:16 +0000)]
Merge "BLE stack doesn't handle multiple l2cap_conn_update requests"
Zhihai Xu [Mon, 6 Jan 2014 23:57:04 +0000 (23:57 +0000)]
Merge "Crash pairing keyboard/mouse on N5"
Zhihai Xu [Tue, 17 Dec 2013 03:20:52 +0000 (19:20 -0800)]
Crash pairing keyboard/mouse on N5
The crash is caused by read the source string out of bound.
Should limit the length to copy less than source string length.
should use the
MIN(SDP_DISC_ATTR_LEN(p_curr_attr->attr_len_type), SDP_MAX_ATTR_LEN);
as the length to copy.
bug:
12166360
Change-Id: I871d7dcaa8bf73aa27e9088417b35b677924bebd
Zhihai Xu [Mon, 6 Jan 2014 19:16:08 +0000 (19:16 +0000)]
Merge "read report array out of boundary for BLE HID device."
Andre Eisenbach [Fri, 8 Nov 2013 18:23:52 +0000 (10:23 -0800)]
LE: Add service UUIDs and data to advertising data
Add support for UUIDs and custom service data in the advertising and
scan response records.
Change-Id: I6470427ad194871488cc90f3ab384b9ecf326b15
Zhihai Xu [Thu, 19 Dec 2013 19:36:55 +0000 (19:36 +0000)]
Merge "need to increase maximum number HID report for HOGP"
Zhihai Xu [Wed, 18 Dec 2013 22:51:52 +0000 (14:51 -0800)]
Can only support two HID report instance for BLE HID.
The follwoing code cause this problem:
BTA_HH_LE_RPT_INST_ID_MAP(s,c)=(UINT8)(((s)<<4)||(c))
The code use || instead of |, this cause we can only generate
two instance HID report 0 and 1(false and true).
bug:
12213520
Change-Id: If6b7cfd9633255401aef12aafd918ee147f256b6
Zhihai Xu [Thu, 19 Dec 2013 02:10:26 +0000 (18:10 -0800)]
need to increase maximum number HID report for HOGP
The Mat mouse have more than 10 report (11),
which exceed our limitation
bug:
12214036
Change-Id: Id578bf7959f73dc3bd57664eccf49ab5580ec76b
Zhihai Xu [Wed, 18 Dec 2013 18:06:13 +0000 (10:06 -0800)]
read report array out of boundary for BLE HID device.
report array out of boundary when read HID report reference
descriptor for BLE HID device.
bug:
12208657
Change-Id: Ic60fd7555045f367b4fcd606510f52f60e36995e
Zhihai Xu [Wed, 18 Dec 2013 04:33:09 +0000 (20:33 -0800)]
BLE stack doesn't handle multiple l2cap_conn_update requests
we can define 4 bits as flags:
1. L2C_BLE_CONN_UPDATE_DISABLE:
if set it means disable update connection parameter. otherwise enable
2.L2C_BLE_NEW_CONN_PARAM:
if set, it means we have new connection parameter which is needed to be configured
if possible(after update done or enable).
3.L2C_BLE_UPDATE_PENDING:
if set, it means waiting for connection parameter update finished.
this flag will be cleared in btu_ble_ll_conn_param_upd_evt.
will be set when we call btsnd_hcic_ble_upd_ll_conn_params
4.L2C_BLE_NOT_DEFAULT_PARAM:
if set, it means we don't use the default connection parameter.
so when we disable update,
we need to configure default connection parameter.
with these 4 flags, we can replace all these states:
UPD_ENABLED, UPD_DISABLED, UPD_PENDING and UPD_UPDATED.
so we can cover all the corner cases which aren't handled
by original code.
bug:
11450715
Change-Id: I6673d4783a8063bf9e8a213c6669800f86e67945
Zhihai Xu [Mon, 16 Dec 2013 23:21:11 +0000 (23:21 +0000)]
Merge "RFCOMM: fix connection timeout during security setup"
kschulz [Tue, 5 Nov 2013 13:37:02 +0000 (14:37 +0100)]
RFCOMM: fix connection timeout during security setup
The RFC_T2_TIMEOUT used in rfc_mx_conf_cnf is replaced with RFCOMM_CONN_TIMEOUT,
increasing the timeout value from 20 sec to 120 sec.
Bug:
11523955
Change-Id: I992f3d20e9e4c6465850dcf1f52af0b7d39dd893
Kim Schulz [Mon, 23 Sep 2013 10:48:47 +0000 (12:48 +0200)]
fix for btsnoop log blogging HCI socket
Fix for bug
10887611 - btsnoop logging can block HCI socket for longer times.
- Removed the use of the same mutex as the receive queue.
- optimized the code (combined identical code pieces)
- added new function for writing to the log
- switched from using multiple write() calls to using a single writev() (to get atomicity).
patch-set 2:
- fixed review comments (overruns + warnings)
patch-set 3:
- fixed problem with non-matching flags for H4
Bug:
10887611
Change-Id: I16cc23a850093448309ec34c73d536b8571441e9
Zhihai Xu [Mon, 16 Dec 2013 22:22:36 +0000 (14:22 -0800)]
remove space.
bug:
10777562
Change-Id: I7560d4769dae2bc7b7796d0e7e133fa3cbd275c8
Zhihai Xu [Mon, 16 Dec 2013 22:16:04 +0000 (22:16 +0000)]
Merge "fixed problem with parsing GetAllCapabilitiesRsp"
Kim Schulz [Tue, 24 Sep 2013 14:01:44 +0000 (16:01 +0200)]
fixed problem with parsing GetAllCapabilitiesRsp
The check for GetAllCapabilitiesRsp was not correctly parsed and hence the qualification tests TP/SIG/SMG/BI-35-C and TP/SIG/SMG/BI-36-C could not be passed.
This fixes that problem and makes it comply with the spec.
Bug:
10906942
Change-Id: I8b46c1974b4cad13d5a6641e02bf8a5f2ebc8ebd
Kim Schulz [Mon, 16 Sep 2013 13:59:33 +0000 (15:59 +0200)]
Fixes for problems found with coverity analyzer
- fixed UNINITIALIZED variable (hdl) in bta_hh_act.c :220
- fixed possible RESOURCE LEAK in btif_config_util.cpp in relation to open_file_map() if file is fd size=0
- fixed possible RESOURCE LEAK in create_socket_server() in uipc:196 (s not closed)
- fixed possible OVERRUN in l2c_csm.c, (l2c_csm_config), array "l2cb.fixed_reg" of 4 20-byte elements at element index 60 (byte offset 1200) using index "p_ccb->local_cid - 3" (which evaluates to 60)
- fixed possible OVERRUN in btm_pm.c, (btm_pm_reset) array "btm_cb.acl_db" of 7 288-byte elements at element index 7 (byte offset 2016) using index "btm_cb.pm_pend_link" (which evaluates to 7).
- fixed possible OVERRUN in btif_storage.c, (btif_storage_add_device_to_autopair_blacklist) array "input_value" of 20 bytes by passing it to a function which accesses it at byte offset 20 using argument "20U".
patch set 2:
- fixed {}
Patch set 3:
- fixed review commment in stack/btm/btm_pm.c:379
bug:
10777562
Change-Id: I2a6d57f93acaaf9b25c49a6a29cb60d0e1e3c5d8
Zhihai Xu [Mon, 16 Dec 2013 21:48:22 +0000 (21:48 +0000)]
Merge " the HID device state is out of sync after upair."
Zhihai Xu [Sat, 16 Nov 2013 05:18:25 +0000 (21:18 -0800)]
the HID device state is out of sync after upair.
the HID device state is out of sync between java layer and bluedroid stack after upair.
This will cause the HID device can't be connected after repair.
YOu can find the following error message
E/HidService( 1452): Hid Device not disconnected: 00:15:9E:20:29:41
bug:
11718702
Change-Id: I271bb77a2cc205c5a0ef396db86b87902d29966b
Zhihai Xu [Mon, 16 Dec 2013 21:36:21 +0000 (21:36 +0000)]
Merge "fix a potential native crash during bluetooth sutdown"
Zhihai Xu [Tue, 26 Nov 2013 01:30:59 +0000 (17:30 -0800)]
fix a potential native crash during bluetooth sutdown
When bluetooth is initialized which call gki_buffer_init,
the buffer pool is allocated by GKI_os_malloc which is
to call libc malloc function.
When bluetooth is cleanup which call GKI_shutdown,
the buffer pool will be freed by GKI_os_free
which is to call libc free function.
So if we access the buffer, after the whole buffer pool is freed,
we will get this native crash.
if we call cleanup during bluetooth disabling:
the state is still BTIF_CORE_STATE_DISABLING,
then GKI_shutdown will call before bte_main_disable
( bt_hc_if->cleanup();), which is before userial thread exit.
Then we may trigger this native crash.
bug:
11793775
Change-Id: Ic8ced12848d25f918a28f4d5ba29b803d6ac5bd7
Zhihai Xu [Mon, 16 Dec 2013 21:26:52 +0000 (21:26 +0000)]
Merge "implement flow control to avoid dropping packets in btif_media_task."
Zhihai Xu [Thu, 19 Sep 2013 18:30:44 +0000 (11:30 -0700)]
implement flow control to avoid dropping packets in btif_media_task.
implment flow conrol to save CPU usage and avoid dropping
packet in btif_media_task when overflow and cpu preemption happen.
when the packet count in the queue is above high watermark, we will
stopping adding packets, when the packet count in the queue is below
low watermark, we will start adding packets again.
bug:
8252054
Change-Id: I3b7795dffbe5f2ae455e239a0234533f6cbb4403
Zhihai Xu [Mon, 16 Dec 2013 21:21:25 +0000 (21:21 +0000)]
Merge "should return correct length and use shorter poll time for ad2p data"
Zhihai Xu [Mon, 16 Sep 2013 02:59:37 +0000 (19:59 -0700)]
should return correct length and use shorter poll time for ad2p data
the default poll timeout(100ms) is too long for a2dp data read,
because the a2dp timer pertiod to read data is 20ms. The poll timeout
should be far less than a2dp timer pertiod. also when poll timeout happen
for read, we should return the data length which we already read instead of 0.
bug:
8252054
Change-Id: Ifa8587c6b7d127cbbbff76d9e20b630303b6379f
Zhihai Xu [Thu, 12 Dec 2013 01:21:53 +0000 (01:21 +0000)]
Merge "Bluetooth does not provide unique identifier for HID devices"
Zhihai Xu [Wed, 11 Dec 2013 19:46:36 +0000 (11:46 -0800)]
Bluetooth does not provide unique identifier for HID devices
use remote device MAC address as the ID in uhid device.
make the format backward compatible with BlueZ.
bug:
12083633
Change-Id: I6edfe94e67b806dbb68820e0ce5582ad3c04753f
Zhihai Xu [Wed, 11 Dec 2013 19:21:10 +0000 (19:21 +0000)]
Merge "set HID major in class of device of inquiry result for HID over LE"
Zhihai Xu [Wed, 27 Nov 2013 02:18:29 +0000 (18:18 -0800)]
set HID major in class of device of inquiry result for HID over LE
need to set HID major in class of device of inquiry result for HID over LE,
if HID over LE service UUID is found in BLE advertisement data.
so we can show the HID icon in device list for HID over LE device.
16 bit UUID list in BLE advertisement data can contain multiple UUID,
need to go through the 16bit UUID list to find HID over LE service UUID.
bug:
11450485
Change-Id: I7b2ee4c88485b287609eac34c35ce5e714e48280
Zhihai Xu [Wed, 11 Dec 2013 19:07:28 +0000 (19:07 +0000)]
Merge "BLE HID device connection failure due to security error."
Zhihai Xu [Wed, 13 Nov 2013 04:18:37 +0000 (20:18 -0800)]
BLE HID device connection failure due to security error.
When HID BLE device start encryption, if some other GATT application
already start encryption(but not finished yet) by calling
gatt_security_check_start. The HID BLE device will be failed to start
encryption, which will cause it to disconnect the BLE HID connection.
The solution is to check whether we already started the encryption
, If the encryption is already started, wait until the encryption
finished, then continue to start security check for BLE HID device.
add encrytion complete event to notify all GATT client encryption done.
filter the event just for BTA HH LE GATT client.
bug:
11636246
Change-Id: If58e57c623cc8cfa05208587b010bec68c71306c
Zhihai Xu [Fri, 6 Dec 2013 22:29:29 +0000 (14:29 -0800)]
use bluetooth HID remote device name as input device name.
bug:
12003067
Change-Id: I74e4921047a27ee79fa1e3cd58056fde2958e60f
Zhihai Xu [Fri, 6 Dec 2013 01:35:41 +0000 (01:35 +0000)]
Merge "Remove the device from le backgrond connection whitelist when it's unpaired"
Zhihai Xu [Sat, 16 Nov 2013 01:55:46 +0000 (17:55 -0800)]
Remove the device from le backgrond connection whitelist when it's unpaired
this is due to we didn't remove the device from the white list before unpair
Which cause a fake pair request from remote device triggered
right after the acl is disconnected.
The fix is to remove the BLE device from whitelist before unpair.
Also fix a problem return wrong device handle from bta_hh_le_add_device.
if bta_hh_le_add_device is called right after reboot, before we connect HID device.
This is normally true for a previous paired device, which we saved in the nvram.
The wrong device handle will cause the removing HID device from while list failed
after unpair the HID device.
bug:
11676338
Change-Id: Id5b45b2829da9a990dfd1dbae0c15764b16c2bfb
Zhihai Xu [Fri, 6 Dec 2013 01:32:48 +0000 (01:32 +0000)]
Merge "BLE Secuity manager state machine generate wrong pairing success event."
Zhihai Xu [Sat, 16 Nov 2013 02:57:28 +0000 (18:57 -0800)]
BLE Secuity manager state machine generate wrong pairing success event.
we call smp_proc_release_delay to setup a timer.
We will send a pair failure message to uplayer after the time expired.
Right before the time expire, the l2cap connection is disconnected
from remote device, we receive L2C_DISC, which will call smp_delay_terminate,
smp_delay_terminate will send a pair success message to uplayer.
The fix is not to change the status if the remote device disconnect the link
bug:
11716967
Change-Id: I8ca63599a170ec86913785aafea552301cec37df
Zhihai Xu [Fri, 6 Dec 2013 01:30:14 +0000 (01:30 +0000)]
Merge "Duplicate pair request are generated in BLE SMP."
Zhihai Xu [Sat, 16 Nov 2013 03:16:26 +0000 (19:16 -0800)]
Duplicate pair request are generated in BLE SMP.
SMP_SEC_REQUEST_EVT will trigger pair request for user permission.
Due to callback event isn't cleared, duplicate pare request is generated.
The fix is to clear the callback event after grant the permission for the pair request.
To avoid reporting duplicae SMP_SEC_REQUEST_EVT.
bug:
11716879
Change-Id: I90805caa6f5360f8d64edfb711703e0e05863ea4
Zhihai Xu [Sun, 17 Nov 2013 01:07:38 +0000 (17:07 -0800)]
sometime the BLE connection parameter isnot updated for the first time
When we receive the BLE connection parameter update
from remote device after smp_send_pair_req before
start BLE service discovery(bta_gattc_set_discover_st).
We will miss update this BLE connection parameter.
The reason is we call
L2CA_EnableUpdateBleConnParams(p_cb->pairing_bda, FALSE);
in smp_send_pair_req ,We change the state to UPD_DISABLED.
When we receive the new BLE connection parameter from
remote device, we will update the state to UPD_PENDING,
which will update the new connection parameter
when enable the connection parameter update.
when we start BLE service discovery
we call L2CA_EnableUpdateBleConnParams(p_srcb->server_bda, FALSE);
in bta_gattc_set_discover_st, We will update the state back to
UPD_DISABLED, which will cause we miss updating
the new connection parameter when enable the connection parameter update.
The fix is don't change the state to UPD_DISABLED
when the state is UPD_PENDING for disabling.
bug:
11727252
Change-Id: I953b9ca669e3460e18b340e7779cc54e03d6305b
Zhihai Xu [Tue, 3 Dec 2013 23:21:02 +0000 (23:21 +0000)]
Merge "Pairing with dissapeard HID decive never times out (in UI)"
Kim Schulz [Mon, 30 Sep 2013 08:55:52 +0000 (10:55 +0200)]
Pairing with dissapeard HID decive never times out (in UI)
- added function to notify the UI about failed HID pairing
patch set2:
- added function header
patch set3:
- break long line
Bug:
10998578
Change-Id: I7314bf07da7ebac7252c6902d987fbca20da2abc
Zhihai Xu [Tue, 3 Dec 2013 23:16:38 +0000 (23:16 +0000)]
Merge "Copy paste error in HDP source/sink check"
Kim Schulz [Mon, 30 Sep 2013 06:51:19 +0000 (08:51 +0200)]
Copy paste error in HDP source/sink check
- fixed copy paste error in sdp_api.c
Bug:
10998127
Change-Id: Icffdf04630777badf76ed46a3e203000df6ecc9f
Zhihai Xu [Tue, 3 Dec 2013 23:13:21 +0000 (23:13 +0000)]
Merge "fixed assignment with no effect"
Kim Schulz [Mon, 30 Sep 2013 07:07:04 +0000 (09:07 +0200)]
fixed assignment with no effect
a variable was wrongfully assigned to itself insted.
Bug:
10998131
Change-Id: Ia563e9f8aa43e264a6664d81d917b7517e1c89b5
Zhihai Xu [Tue, 3 Dec 2013 23:10:18 +0000 (23:10 +0000)]
Merge "Fixed wrong operator in uipc.c that cause always true check"
Kim Schulz [Mon, 30 Sep 2013 07:23:23 +0000 (09:23 +0200)]
Fixed wrong operator in uipc.c that cause always true check
- changed from using logical OR to using logical AND
Bug:
10998096
Change-Id: Idf15dbc1c605c94094b79137a4075040fe9bcf0b
Kim Schulz [Tue, 24 Sep 2013 13:11:05 +0000 (15:11 +0200)]
memset arguments wrongfully swapped
the arguments for one of the memset calls was wrong.
Bug:
10907215
Change-Id: Ie00a3a6b829b99fd94659a764b6f0309684d9303
Matthew Xie [Tue, 12 Nov 2013 03:01:23 +0000 (19:01 -0800)]
am
46ebeb1d: Merge "LE: Increase number of simultaneous connections" into klp-dev
* commit '
46ebeb1d5f2536445590d142f01247de4e24893c':
LE: Increase number of simultaneous connections
Matthew Xie [Tue, 12 Nov 2013 02:56:19 +0000 (02:56 +0000)]
Merge "LE: Increase number of simultaneous connections" into klp-dev
Andre Eisenbach [Fri, 1 Nov 2013 21:47:52 +0000 (14:47 -0700)]
LE: Increase number of simultaneous connections
Currently the maximum number of parallel connections is 4. This patch
increases the limit to allow for more devices.
bug
11571899
Change-Id: I42b77e6b67f59d7d430d879a5fb0eb80982160b5
Zhihai Xu [Mon, 11 Nov 2013 23:09:29 +0000 (15:09 -0800)]
am
72658f48: BLE is disconnected due to BLE service record discovery failure.
* commit '
72658f48d653be0786ef924bb3abbf7df1ec6592':
BLE is disconnected due to BLE service record discovery failure.
Zhihai Xu [Mon, 11 Nov 2013 01:25:45 +0000 (17:25 -0800)]
BLE is disconnected due to BLE service record discovery failure.
the root cause of the problem is:
In BLE GATT client state machine, When It is in discovery state,
any command to access the service, characteristic and descriptor
will be queued, these commands will be executed after BLE service
discovery complete. When we queue the command, we will copy these
message. The problem is we didn't copy these message correctly.
We didn't deep copy these messages. There are pointers inside
these messages. These pointers are still point to the old message
which are already freed. When the messages are reused, the original
content will lost. The queued commands will be corrupted.
This is very serious issue, which can cause a lot of stability problem.
bug:
11620252
Change-Id: I93082a9dbcc3a676f5f791c2b1ea98e49b165813
Matthew Xie [Fri, 8 Nov 2013 19:35:20 +0000 (11:35 -0800)]
am
dbba0e65: Replace Broadcom proprietary license header with apache 2 header
* commit '
dbba0e652e0ce23dd691df3c03979ec6e32c8db3':
Replace Broadcom proprietary license header with apache 2 header
Matthew Xie [Fri, 8 Nov 2013 18:13:21 +0000 (10:13 -0800)]
Replace Broadcom proprietary license header with apache 2 header
bug
11591406
Change-Id: Ibb9c6b3865e6d757236f1c5896775bb6f28e47be
Matthew Xie [Thu, 7 Nov 2013 19:12:13 +0000 (11:12 -0800)]
am
04e05e9a: Merge "LE: Add devices to the inquiry db before connecting" into klp-dev
* commit '
04e05e9a39cbed22a099458c35207795a0039043':
LE: Add devices to the inquiry db before connecting
Matthew Xie [Thu, 7 Nov 2013 19:06:39 +0000 (19:06 +0000)]
Merge "LE: Add devices to the inquiry db before connecting" into klp-dev
Zhihai Xu [Thu, 7 Nov 2013 19:05:40 +0000 (11:05 -0800)]
am
dfd036d9: Merge "fix a memory leakage when Queue search or discovery event." into klp-dev
* commit '
dfd036d96a745af198a532748a600d0c4d6ab1f4':
fix a memory leakage when Queue search or discovery event.
Zhihai Xu [Thu, 7 Nov 2013 19:00:17 +0000 (19:00 +0000)]
Merge "fix a memory leakage when Queue search or discovery event." into klp-dev
Andre Eisenbach [Thu, 7 Nov 2013 07:35:48 +0000 (23:35 -0800)]
LE: Add devices to the inquiry db before connecting
Ensure that the remote device type is set correctly by reading the
device information from non-volatile storage and (re-)adding it to
the inquiry database before connecting to a remote GATT device.
bug
11573208
Change-Id: Ifa69da3d5871aed5293ea5e611144874b67afe72
Zhihai Xu [Thu, 7 Nov 2013 03:23:13 +0000 (19:23 -0800)]
fix a memory leakage when Queue search or discovery event.
bug:
11562902
Change-Id: I16ba8cfb727d05e5d324c6301ba0ab23e729232b
Zhihai Xu [Thu, 7 Nov 2013 03:11:57 +0000 (19:11 -0800)]
am
c04aadc3: Merge "Fixes random host disconnection after establishing connection" into klp-dev
* commit '
c04aadc3d5925fa499aa0449f4e94a04308480ea':
Fixes random host disconnection after establishing connection
Zhihai Xu [Thu, 7 Nov 2013 03:06:33 +0000 (03:06 +0000)]
Merge "Fixes random host disconnection after establishing connection" into klp-dev
Sunny Kapdi [Wed, 7 Aug 2013 19:30:20 +0000 (12:30 -0700)]
Fixes random host disconnection after establishing connection
Host starts encryption twice when the remote device is
already paired. The host sends disconnect when the
second encryption attempt returns failure. This fix
avoids duplicate encryption attempt.
bug:
11450719
Change-Id: I8ec5c4a953180ec17585aece757810421bc44aae
Matthew Xie [Thu, 7 Nov 2013 00:11:44 +0000 (16:11 -0800)]
am
6088d83d: Merge "whitelist well tested devices for absolute volume feature" into klp-dev
* commit '
6088d83d6ce30275b15fd0e5955a83f709f03172':
whitelist well tested devices for absolute volume feature
Matthew Xie [Thu, 7 Nov 2013 00:05:25 +0000 (00:05 +0000)]
Merge "whitelist well tested devices for absolute volume feature" into klp-dev
Matthew Xie [Wed, 6 Nov 2013 01:19:39 +0000 (17:19 -0800)]
whitelist well tested devices for absolute volume feature
We are blacklisting all the devices that are not in whitelist
instead of blacklisting known bad devices.
bug
11124170
Change-Id: I044970df611d2a800d7698d4a63331644ab107ce
Zhihai Xu [Wed, 6 Nov 2013 06:58:02 +0000 (22:58 -0800)]
am
29fdb17a: Merge "need to save the BLE HID UUID to NVRAM" into klp-dev
* commit '
29fdb17a232f45c5550e7fa8d773f87e06ac58f1':
need to save the BLE HID UUID to NVRAM
Zhihai Xu [Wed, 6 Nov 2013 06:54:58 +0000 (06:54 +0000)]
Merge "need to save the BLE HID UUID to NVRAM" into klp-dev
Zhihai Xu [Wed, 6 Nov 2013 02:06:54 +0000 (18:06 -0800)]
need to save the BLE HID UUID to NVRAM
need to save the BLE HID UUID to NVRAM.
otherwise we will miss the HID profile setting
in device profile list of the BLE HID device after reboot.
bug:
11541617
Change-Id: I11e1c871768e999ec1f48396018c3be379cc1b7d
Matthew Xie [Wed, 6 Nov 2013 02:02:49 +0000 (18:02 -0800)]
am
8fb6973d: Merge "Add toyota venza to the auto pair blacklist" into klp-dev
* commit '
8fb6973d0988a91f7debfddd7dfb79a730138f52':
Add toyota venza to the auto pair blacklist
Matthew Xie [Wed, 6 Nov 2013 01:25:24 +0000 (01:25 +0000)]
Merge "Add toyota venza to the auto pair blacklist" into klp-dev
Matthew Xie [Tue, 5 Nov 2013 05:55:07 +0000 (21:55 -0800)]
am
e38180dc: Merge "Bluetooth: Send Error for Invalid AT Command." into klp-dev
* commit '
e38180dc7880e5aea76637138661d54bcd9cf875':
Bluetooth: Send Error for Invalid AT Command.
Zhihai Xu [Tue, 5 Nov 2013 05:53:53 +0000 (21:53 -0800)]
am
2003ec03: Merge "A typo to set wrong max connection interval value when we create a BLE connection." into klp-dev
* commit '
2003ec03dbf7c82cdb655fa64746397a1e775cc0':
A typo to set wrong max connection interval value when we create a BLE connection.
Zhihai Xu [Tue, 5 Nov 2013 05:53:20 +0000 (21:53 -0800)]
am
cd9ceb9f: Merge "Unable to connect to a Motorola s705 until Bluetooth was toggled of and back on" into klp-dev
* commit '
cd9ceb9f48d633b68570e5f70768475c8fe93af1':
Unable to connect to a Motorola s705 until Bluetooth was toggled of and back on
Sunny Kapdi [Tue, 5 Nov 2013 05:53:19 +0000 (21:53 -0800)]
am
7a5c5910: Fixes BLE HCI commands concurrency issue
* commit '
7a5c5910c1df73ab86e57d18c4e6e35a623d98ce':
Fixes BLE HCI commands concurrency issue
Matthew Xie [Mon, 4 Nov 2013 22:11:14 +0000 (22:11 +0000)]
Merge "Bluetooth: Send Error for Invalid AT Command." into klp-dev
Zhihai Xu [Sun, 3 Nov 2013 03:42:28 +0000 (03:42 +0000)]
Merge "A typo to set wrong max connection interval value when we create a BLE connection." into klp-dev
Sunny Kapdi [Mon, 29 Jul 2013 05:29:37 +0000 (10:59 +0530)]
Bluetooth: Send Error for Invalid AT Command.
Some Headsets send HFP 1.6 cmds even when it is not
supported by DUT.Send error response in those cases.
bug
11450717
Change-Id: If7745959c00fd49bd737b41a49adba9e726aa5c7
Zhihai Xu [Sat, 2 Nov 2013 00:09:49 +0000 (00:09 +0000)]
Merge "Unable to connect to a Motorola s705 until Bluetooth was toggled of and back on" into klp-dev
Zhihai Xu [Fri, 25 Oct 2013 23:47:49 +0000 (16:47 -0700)]
A typo to set wrong max connection interval value when we create a BLE connection.
when we set the max connection interval value,
we should use BTM_BLE_CONN_INT_MAX_DEF instead of BTM_BLE_CONN_INT_MIN
bug:
11390678
Change-Id: Ia3f6d5e9cb91b2e998d014ed4849eff8455af770