OSDN Git Service
Hemant Gupta [Thu, 28 Nov 2013 07:37:10 +0000 (13:07 +0530)]
GAP: Try to retrieve CoD from NVRAM if 0
This patch tries to retreive CoD from NVRAM if CoD is 0. This is
because in scenarios when airplane mode on/off, inquiry is not
performed again on devices shown in Available devices List of
UI, so CoD is 0 during SSP information as database of stack is
not properly updated since inquiry is not performed again. Without
this patch it was observed because of wrong CoD info device icon
for HID mouse was changed to Joystick and device is not shown in
Paired List. Also some extra debug logs are added in code for
better debugging.
Change-Id: I14858ccee04728cb4b9cd60d397b79fa6494b842
Hemant Gupta [Fri, 5 Jul 2013 18:05:58 +0000 (23:35 +0530)]
HID: Reset Disconnect Reason on Connection Establishment
This patch resets the disconnect reason to successful on HID Interrupt
channel establishment. Without this change, wrong reason is propogated
to BTA layer on disconnection initiated either from DUT or Remote end.
Change-Id: I42641b511e44a761574faf8eafb7b0826e24aeb3
Zhihai Xu [Fri, 13 Dec 2013 10:39:21 +0000 (16:09 +0530)]
HID: Remove device from nvram on auth failure
This patch removed hid pointing device from nvram on authentication failure
due to pairing timeout or when wrong passkey is entered. Without this patch
it was observed that hid pointing device was always shown in paired list
when DUT was restarted after authentication failure.
CL from qcom(Hemant Gupta)
Change-Id: I69c43d2ed982d5d5abfd5707db90ef4b5c65b34f
Zhihai Xu [Mon, 21 Apr 2014 19:05:42 +0000 (00:35 +0530)]
HID: Use dynamic memory while sending report
This patch uses dynamic memory allocation while sending HID output data to
remote device depending on size of data to be sent. Without this patch
fixed size static buffer of 200 bytes was being used for sending data to
remote device, which was resulting in crash in case data size to be sent
to remote device was greater than 200 bytes.
CL from qcom(Hemant Gupta)
Change-Id: Icc8cd4a4ecfd4bc30cbf848a7c865fcf9308ddf8
Hemant Gupta [Tue, 29 Oct 2013 06:11:16 +0000 (11:41 +0530)]
HID: Serialize L2CAP disconnection
This patch serializes host initiated hid disconnection by sending
control channel disconnect request only when disconnection response
for interrupt channel has been received.
Change-Id: Ie0c5c62593bb0dd32f83b76bf0d6c1d950f1a684
Hemant Gupta [Fri, 22 Nov 2013 15:23:53 +0000 (20:53 +0530)]
HID: Handle connection failure in disconnecting state
This patch handles connectio error of interrupt channel while in
disconnecting state. Without this patch it was seen that upper
layers would not be informed about failure of interrupt channel
connection in this corner case leading to UI stuck at connecting
forever.
Change-Id: I1f5f18e70470eff17b21f2ed921edaefd3c89f9c
Hemant Gupta [Mon, 9 Dec 2013 13:13:33 +0000 (18:43 +0530)]
HID: Reset Idle timeout to 0 while hid disconnection
This patch resets idle l2cap timeout to 0 while disconnecting HID L2CAP's.
without this patch it was observed that after hid l2cap disconnection,
ACL disconnection was taking 4 seconds.
Change-Id: I39f16d3981f4a8b5cdf28cd7865631900007d5b8
Zhihai Xu [Sun, 24 Nov 2013 10:53:55 +0000 (16:23 +0530)]
HID: Fix memory leak in HID Code
This patch fixes memory leak in HID code when interrupt reports are
received from remote device before HID connection is setup.
CL from qcom(Hemant Gupta)
Change-Id: If4fe961921c7b1212035cf5f2aa60d2359e322e2
Hemant Gupta [Thu, 10 Apr 2014 11:00:55 +0000 (16:30 +0530)]
HID: Reduce poll time to 50 ms for polling from uhid driver
This patch reduces poll time for data received from uhid driver to 50 ms
from existing 500 ms. Without this change bta thread was getting blocked upto
max 500 ms when HID is disconnected, which caused delay in sending
of AVDTP Media packets during A2DP and HID concurrent test cases resulting
in audio break on BT headset during HID disconnection as closing of uhid
polling thread is done from BTA context.
Change-Id: I033e2d81e895831555bbfdff1f93fad5f2cc5e59
Hemant Gupta [Mon, 21 Apr 2014 18:14:13 +0000 (23:44 +0530)]
HID: Update SSR parameters during copy.
This patch correctly stores SSR parameters (max latency and min timeout)
retrieved from remote device SDP record in NVRAM.
Change-Id: I87d8b6181981090df21ab746deac7053a1d0e938
Hemant Gupta [Wed, 2 Apr 2014 13:58:47 +0000 (19:28 +0530)]
HID: Establish Interrupt Channel when Control channel is configured
This patch starts establishment of Interrupt channel only when HID Control
channel has been properly configured.
Change-Id: I28f1100abeece9255fbdd5df312236c18baebe17
Sharvil Nanavati [Mon, 7 Apr 2014 20:52:37 +0000 (13:52 -0700)]
Add flow control for PAN.
This change reads from the TAP fd only when btpan_cb.flow == 1.
The value of this flag changes based on L2CAP congestion events.
http://b/
13246629
Change-Id: Ic28bf65737dbd74c41b68198fceee58e3bff08d4
Conflicts:
btif/src/btif_pan.c
Wei Wang [Fri, 18 Apr 2014 23:08:43 +0000 (16:08 -0700)]
Fixed a build warning.
Change-Id: I34885d6e588855d3ca8192db8a54b43ef348c794
Andre Eisenbach [Thu, 21 Nov 2013 01:23:06 +0000 (17:23 -0800)]
LE: Add controller based advertising filter API (2/2)
Change-Id: I444654bf19a048d5fcef33f79edbf1cdda3d3b62
Sharvil Nanavati [Fri, 18 Apr 2014 05:32:05 +0000 (22:32 -0700)]
Eliminate warnings, add -Wall and -Werror to all projects.
This change enables all warnings and treats warnings as errors. As
a result, nobody should be able to submit new code to bluedroid
that contains compiler warnings. Instead, they should fix the warnings
before submitting.
This change has already caught a type mismatch bug in
stack/avrc/avrc_api.c where an integer was being stored in a boolean.
Change-Id: Ic41960754b39a1a6aa37f1c1095003195f466183
Zhihai Xu [Wed, 8 Jan 2014 19:45:17 +0000 (11:45 -0800)]
increase the bluetooth task priority when start a2dp.
change the BT task priority based on audio play state.
increase the BT task priority to ANDROID_PRIORITY_URGENT_AUDIO
,when start ad2p audio playing.
to better prevent CPU premption by other process/task(UI).
restore the BT task priority when stop a2dp audio playing.
bug:
12082841
Change-Id: I34e8344cffea87f68987149c820cd3e84a4196d1
Conflicts:
utils/include/bt_utils.h
Sharvil Nanavati [Sat, 5 Apr 2014 07:44:19 +0000 (00:44 -0700)]
Compile using C99.
Change-Id: Ifda03e0b3ee3a915bf7ce5a5dce27e5e215dcce2
Conflicts:
bta/Android.mk
gki/Android.mk
main/Android.mk
stack/Android.mk
test/bluedroidtest/Android.mk
Hemant Gupta [Tue, 24 Dec 2013 14:29:57 +0000 (19:59 +0530)]
Bluetooth: GAP: Send bond none in case of temp pairing
Send BOND_NONE in case of temporary device pairing on
receiving the authentication complete, so that UI
doesn't get stucked in pairing for that device.
Change-Id: Ided412ef89d928f958a0052362be145232411c0a
Sharvil Nanavati [Mon, 14 Apr 2014 04:26:56 +0000 (21:26 -0700)]
Remove unused file gki_inet.h and BIG_ENDIAN macro.
Change-Id: I52bb7befdff6138dce4ce74ebd65d4e3763b82aa
Sharvil Nanavati [Sun, 13 Apr 2014 06:01:10 +0000 (23:01 -0700)]
Remove executable bit on source files.
Change-Id: Id456478aea626f57fed3479346e8fb4dbd0fafa6
Bill Yi [Wed, 30 Apr 2014 00:57:49 +0000 (00:57 +0000)]
Bill Yi [Wed, 30 Apr 2014 00:49:53 +0000 (00:49 +0000)]
Bill Yi [Tue, 29 Apr 2014 18:34:02 +0000 (11:34 -0700)]
Matthew Xie [Tue, 22 Apr 2014 13:41:58 +0000 (13:41 +0000)]
am
1b562939: am
2e470dc4: Merge "Use 0000 as pin key for PORCHE_PAIRING_CONFLICT issue"
* commit '
1b562939899f7c91c437b390e6e216c7c53acfd6':
Use 0000 as pin key for PORCHE_PAIRING_CONFLICT issue
Matthew Xie [Tue, 22 Apr 2014 13:36:22 +0000 (13:36 +0000)]
am
2e470dc4: Merge "Use 0000 as pin key for PORCHE_PAIRING_CONFLICT issue"
* commit '
2e470dc48e608fd46cd2d55aa01efb9ce7eb4bdb':
Use 0000 as pin key for PORCHE_PAIRING_CONFLICT issue
Matthew Xie [Tue, 22 Apr 2014 00:00:02 +0000 (00:00 +0000)]
Merge "Use 0000 as pin key for PORCHE_PAIRING_CONFLICT issue"
Ariel Gertzenstein [Mon, 21 Apr 2014 18:50:22 +0000 (18:50 +0000)]
am
c352606d: (-s ours) am
9056d20c: DO NOT MERGE Rewrite PAN_Write in terms of PAN_WriteBuf.
* commit '
c352606db3258360fc32cf435c0ad23e55a1cc67':
DO NOT MERGE Rewrite PAN_Write in terms of PAN_WriteBuf.
Ariel Gertzenstein [Mon, 21 Apr 2014 18:47:37 +0000 (18:47 +0000)]
am
9056d20c: DO NOT MERGE Rewrite PAN_Write in terms of PAN_WriteBuf.
* commit '
9056d20c9364cb4829aabeb517b98440aa0d5240':
DO NOT MERGE Rewrite PAN_Write in terms of PAN_WriteBuf.
Ariel Gertzenstein [Sat, 5 Apr 2014 06:57:10 +0000 (23:57 -0700)]
DO NOT MERGE Rewrite PAN_Write in terms of PAN_WriteBuf.
The original code looked copy/pasted. The new implementation still
results in the same number of buffer copies but is much easier to
read and reduces redundancy.
Change-Id: I3ace395d2b124074e9687d13ae9a1b0b93a25a31
Matthew Xie [Mon, 21 Apr 2014 18:21:20 +0000 (18:21 +0000)]
am
72f5ce63: am
4b416130: Merge "Bluetooth: Adding Sniff feature for PAN Profile"
* commit '
72f5ce63c2dbf31c7cfbb903c687ea71ad29b3ea':
Bluetooth: Adding Sniff feature for PAN Profile
Matthew Xie [Mon, 21 Apr 2014 18:16:24 +0000 (18:16 +0000)]
am
4b416130: Merge "Bluetooth: Adding Sniff feature for PAN Profile"
* commit '
4b41613019829b40e8ca75a87219a415c51ae3a1':
Bluetooth: Adding Sniff feature for PAN Profile
Matthew Xie [Mon, 21 Apr 2014 18:09:38 +0000 (18:09 +0000)]
Merge "Bluetooth: Adding Sniff feature for PAN Profile"
Mark Salyzyn [Thu, 17 Apr 2014 23:33:48 +0000 (23:33 +0000)]
am
a80ba72d: am
743034a5: Merge "bluedroid: audio_a2dp_hw 64 bit compile issues"
* commit '
a80ba72d63b0422c202ed1db273dbaa61bbd6a1b':
bluedroid: audio_a2dp_hw 64 bit compile issues
Mark Salyzyn [Thu, 17 Apr 2014 23:22:36 +0000 (23:22 +0000)]
am
743034a5: Merge "bluedroid: audio_a2dp_hw 64 bit compile issues"
* commit '
743034a53dcf8552a53ec3d69157109c77b64f8e':
bluedroid: audio_a2dp_hw 64 bit compile issues
Mark Salyzyn [Thu, 17 Apr 2014 23:11:13 +0000 (23:11 +0000)]
Merge "bluedroid: audio_a2dp_hw 64 bit compile issues"
Mark Salyzyn [Thu, 17 Apr 2014 20:45:20 +0000 (13:45 -0700)]
bluedroid: audio_a2dp_hw 64 bit compile issues
Change-Id: Ieeb5d463215c503afb3fca9953c7b0248abf812f
Ariel Gertzenstein [Wed, 16 Apr 2014 21:24:22 +0000 (21:24 +0000)]
am
b9e8b464: (-s ours) am
3a038dd6: DO NOT MERGE Fix bug where btpan_control_state_callback is called with invalid args.
* commit '
b9e8b46481e60beef43886acdd173caaf139e74e':
DO NOT MERGE Fix bug where btpan_control_state_callback is called with invalid args.
Matthew Xie [Wed, 16 Apr 2014 21:20:34 +0000 (21:20 +0000)]
am
e74b1a0e: am
87bea5bc: Merge "Fix bug where btpan_control_state_callback is called with invalid args."
* commit '
e74b1a0e4613d4aa109378b692d6ebdb9f2c6a6d':
Fix bug where btpan_control_state_callback is called with invalid args.
Ariel Gertzenstein [Wed, 16 Apr 2014 21:18:33 +0000 (21:18 +0000)]
am
3a038dd6: DO NOT MERGE Fix bug where btpan_control_state_callback is called with invalid args.
* commit '
3a038dd60e898e23c103bae94eae91d3b15b4c38':
DO NOT MERGE Fix bug where btpan_control_state_callback is called with invalid args.
Ariel Gertzenstein [Sun, 2 Feb 2014 00:53:15 +0000 (16:53 -0800)]
DO NOT MERGE Fix bug where btpan_control_state_callback is called with invalid args.
When there's a connection error, btpan_control_state_callback sometimes
gets called back with incorrect local_role and remote_role values. These
values are simply not set (uninitialized) on one of the error handling
codepaths.
http://b/
12854810
Change-Id: Ie2d9d252f185fca48ee6e2bfb697039d0ac10b43
Matthew Xie [Wed, 16 Apr 2014 20:56:33 +0000 (20:56 +0000)]
am
87bea5bc: Merge "Fix bug where btpan_control_state_callback is called with invalid args."
* commit '
87bea5bc24f03b671328bfdbac86b60085c1d2e1':
Fix bug where btpan_control_state_callback is called with invalid args.
Matthew Xie [Wed, 16 Apr 2014 20:49:20 +0000 (20:49 +0000)]
Merge "Fix bug where btpan_control_state_callback is called with invalid args."
Ariel Gertzenstein [Wed, 16 Apr 2014 18:38:05 +0000 (18:38 +0000)]
am
77a19389: (-s ours) am
34fa499c: DO NOT MERGE Fix bug in PAN code where no new PAN connections can be made.
* commit '
77a1938999278af07710c7c28bbe0075dfa956f5':
DO NOT MERGE Fix bug in PAN code where no new PAN connections can be made.
Ariel Gertzenstein [Wed, 16 Apr 2014 18:35:52 +0000 (18:35 +0000)]
am
34fa499c: DO NOT MERGE Fix bug in PAN code where no new PAN connections can be made.
* commit '
34fa499c449b8e464cb417a9e8dce4eb027b4a30':
DO NOT MERGE Fix bug in PAN code where no new PAN connections can be made.
Ariel Gertzenstein [Fri, 31 Jan 2014 21:39:43 +0000 (13:39 -0800)]
DO NOT MERGE Fix bug in PAN code where no new PAN connections can be made.
If you call PAN_connect() followed quickly by PAN_disconnect(),
you won't be able to establish any additional PANU connections.
This happens because the connection never has a chance to make
it into PAN_STATE_CONNECTED and num_conns only gets decremented
if you disconnect in the connected state. As a result, subsequent
calls to connect will fail because the stack still believes there
to be an existing connection.
Change-Id: Id24873828ca4f517496cb19a44993d0e8e837a1e
Nitin Shivpure [Thu, 29 Aug 2013 15:58:59 +0000 (21:28 +0530)]
Bluetooth: Adding Sniff feature for PAN Profile
Sniff feature for PAN profile was not implemented in power
manager module of the stack, which was causing higher power
consumption after connecting PAN profile, Even though PAN
ACL link is idle & there is no data communication between
DUT & remote device. Adding sniff feature for PANU role &
NAP role to reduce power consumption.
Change-Id: Idf568f53a317abd536edf34fbdf1733fdf53b7d0
Thomas.TT_Lin [Mon, 7 Apr 2014 08:13:06 +0000 (16:13 +0800)]
flounder64: bluetooth: Adjust volume level on BT HS and DUT side
MW600 Bluetooth address is "58:17:0c:e8:b0:7a". It is not included in
AVRCP profile white list. So it can't support absolute volume. We need
to whitelist it by device name "MW600" instead device address method.
Signed-off-by: Thomas.TT_Lin <Thomas.TT_Lin@htc.com>
Change-Id: I41b27fbab13dcf9d0005e8d5ae25ffb95eb546d4
Matthew Xie [Tue, 8 Apr 2014 09:24:13 +0000 (09:24 +0000)]
am
4ec26844: am
c7d4ce67: Merge "Bluetooth:GAP: Add NULL check before accessing accept socket"
* commit '
4ec26844f88e37dda00f1319ce6ab44fa87539f2':
Bluetooth:GAP: Add NULL check before accessing accept socket
Matthew Xie [Tue, 8 Apr 2014 09:14:39 +0000 (09:14 +0000)]
am
c7d4ce67: Merge "Bluetooth:GAP: Add NULL check before accessing accept socket"
* commit '
c7d4ce671ccc74ee05813bef10639fd34e1bf81f':
Bluetooth:GAP: Add NULL check before accessing accept socket
Matthew Xie [Tue, 8 Apr 2014 06:59:56 +0000 (06:59 +0000)]
Merge "Bluetooth:GAP: Add NULL check before accessing accept socket"
Zhihai Xu [Mon, 7 Apr 2014 19:54:54 +0000 (19:54 +0000)]
am
2f2d9f41: am
a0cf8d6f: remove all advertised services in SDP btif_av_init is called twice. Don\'t need call it in enable. disable EDR ATT SDP record
* commit '
2f2d9f412f7dc999eee87161cb2c30c786523ff2':
remove all advertised services in SDP btif_av_init is called twice. Don't need call it in enable. disable EDR ATT SDP record
Zhihai Xu [Mon, 7 Apr 2014 19:48:36 +0000 (19:48 +0000)]
am
a0cf8d6f: remove all advertised services in SDP btif_av_init is called twice. Don\'t need call it in enable. disable EDR ATT SDP record
* commit '
a0cf8d6f47fd6709085b9ad2c8626986f7ae7f21':
remove all advertised services in SDP btif_av_init is called twice. Don't need call it in enable. disable EDR ATT SDP record
Zhihai Xu [Sat, 5 Apr 2014 07:25:20 +0000 (00:25 -0700)]
remove all advertised services in SDP
btif_av_init is called twice. Don't need call it in enable.
disable EDR ATT SDP record
bug:
13558005
Change-Id: Id834697eae150018f9a0382d9c1e6c972e885739
Zhihai Xu [Thu, 3 Apr 2014 01:41:26 +0000 (01:41 +0000)]
am
616c40a8: am
d5733232: open GATT client didn\'t reserve the BLE link if open after connected.
* commit '
616c40a8684e9324af002a9742ce74f01f87038c':
open GATT client didn't reserve the BLE link if open after connected.
Zhihai Xu [Wed, 2 Apr 2014 23:21:25 +0000 (23:21 +0000)]
am
d5733232: open GATT client didn\'t reserve the BLE link if open after connected.
* commit '
d5733232313da1a9a6c27c37c1ce8dc2d7c790ac':
open GATT client didn't reserve the BLE link if open after connected.
Zhihai Xu [Mon, 3 Mar 2014 20:50:13 +0000 (12:50 -0800)]
open GATT client didn't reserve the BLE link if open after connected.
need to reserve the BLE link to avoid BLE disconnection.
BTA_GATTC_OPEN_ERROR won't resereve the BLE link usage.
use BTA_GATTC_OPEN instead of BTA_GATTC_OPEN_ERROR to reserve the
BLE link. other the stack disconnect the BLE link due to no Gatt interface
use this connection.
bug:
13228455
Change-Id: I1f9daa2171668f2ae535d998b401f1f0825d0451
Mike J. Chen [Wed, 2 Apr 2014 01:09:07 +0000 (01:09 +0000)]
am
4927e67f: am
3576c564: Fix compiler/linker errors when BTA_PAN_INCLUDED is FALSE
* commit '
4927e67fb8cd3cd09b2607241c3da875f85ed852':
Fix compiler/linker errors when BTA_PAN_INCLUDED is FALSE
Mike J. Chen [Wed, 2 Apr 2014 01:09:07 +0000 (01:09 +0000)]
am
3fc61a27: am
0df29ac9: Fix compiler/linker errors when A2D_SC_INCLUDED is FALSE
* commit '
3fc61a2764bd2bba7dd34abaffb625f64108dfd7':
Fix compiler/linker errors when A2D_SC_INCLUDED is FALSE
Mike J. Chen [Wed, 2 Apr 2014 01:09:06 +0000 (01:09 +0000)]
am
5a8ce371: am
5be3cb02: Fix compiler warnings when BLE_INCLUDED is FALSE
* commit '
5a8ce371f41f355084ed912270dbe9bd68470f88':
Fix compiler warnings when BLE_INCLUDED is FALSE
Mike J. Chen [Wed, 2 Apr 2014 01:02:36 +0000 (01:02 +0000)]
am
3576c564: Fix compiler/linker errors when BTA_PAN_INCLUDED is FALSE
* commit '
3576c564b33c20b5e2e90fdd3bca7ce24392ca50':
Fix compiler/linker errors when BTA_PAN_INCLUDED is FALSE
Mike J. Chen [Wed, 2 Apr 2014 01:02:36 +0000 (01:02 +0000)]
am
0df29ac9: Fix compiler/linker errors when A2D_SC_INCLUDED is FALSE
* commit '
0df29ac95d057a1bf74b003fa6dd6459743bcf54':
Fix compiler/linker errors when A2D_SC_INCLUDED is FALSE
Mike J. Chen [Wed, 2 Apr 2014 01:02:35 +0000 (01:02 +0000)]
am
5be3cb02: Fix compiler warnings when BLE_INCLUDED is FALSE
* commit '
5be3cb02b6947a5f115eee0c8a419f99b936c296':
Fix compiler warnings when BLE_INCLUDED is FALSE
Mike J. Chen [Tue, 1 Apr 2014 19:54:27 +0000 (12:54 -0700)]
Fix compiler/linker errors when BTA_PAN_INCLUDED is FALSE
Change-Id: I14acefd66291adc2119daf97bd364b2eecf18d51
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mike J. Chen [Tue, 1 Apr 2014 19:54:00 +0000 (12:54 -0700)]
Fix compiler/linker errors when A2D_SC_INCLUDED is FALSE
Change-Id: I716927939c0f3090f16be4b2329ef22d9a6ca734
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mike J. Chen [Tue, 1 Apr 2014 19:52:09 +0000 (12:52 -0700)]
Fix compiler warnings when BLE_INCLUDED is FALSE
Change-Id: I0d8f861d8a9a94586885c9acd683dd040249a465
Signed-off-by: Mike J. Chen <mjchen@google.com>
Zhihai Xu [Tue, 1 Apr 2014 01:03:11 +0000 (01:03 +0000)]
am
a27b6503: am
221b822c: Merge "Workaround IPHONE problem" into klp-modular-dev
* commit '
a27b650322c6ad1d5cea2d0b4fcb7815e3176d1e':
Workaround IPHONE problem
Zhihai Xu [Tue, 1 Apr 2014 00:13:01 +0000 (00:13 +0000)]
am
221b822c: Merge "Workaround IPHONE problem" into klp-modular-dev
* commit '
221b822ce1c42f4a51abc384cf09ca09b6180a9c':
Workaround IPHONE problem
Zhihai Xu [Mon, 31 Mar 2014 23:00:42 +0000 (23:00 +0000)]
Merge "Workaround IPHONE problem" into klp-modular-dev
Zhihai Xu [Tue, 18 Mar 2014 22:27:05 +0000 (15:27 -0700)]
Workaround IPHONE problem
When we send LL_ENC_REQ to iphone early, iphone didn't send
LL_ENC_RESPONSE back to us, later the iphone will disconnect from us.
The workaround is to send LL_ENC_REQ after receive first ATT read request
from iphone, Iphone will be ready at that time by experiment.
bug:
13417692
Change-Id: Ic42dda36b927df260113771152cff67032b22e5f
Zhihai Xu [Mon, 31 Mar 2014 21:47:07 +0000 (21:47 +0000)]
am
d86082bf: am
9b971dc5: Merge "treat BTA_BUSY as success to avoid unpair the BLE device" into klp-modular-dev
* commit '
d86082bfabffa25f2af77cc69c590d6e0b14260c':
treat BTA_BUSY as success to avoid unpair the BLE device
Zhihai Xu [Mon, 31 Mar 2014 21:41:14 +0000 (21:41 +0000)]
am
9b971dc5: Merge "treat BTA_BUSY as success to avoid unpair the BLE device" into klp-modular-dev
* commit '
9b971dc52f5933c04e4f49ad99c9949df961afc5':
treat BTA_BUSY as success to avoid unpair the BLE device
Matthew Xie [Mon, 31 Mar 2014 21:39:37 +0000 (21:39 +0000)]
Merge "SDP: Allocate proper sized scratch buffer for SDP response"
Zhihai Xu [Mon, 31 Mar 2014 21:35:45 +0000 (21:35 +0000)]
Merge "treat BTA_BUSY as success to avoid unpair the BLE device" into klp-modular-dev
Zhihai Xu [Mon, 31 Mar 2014 21:35:39 +0000 (21:35 +0000)]
am
20222380: am
2011d136: Merge "LE: Add API to configure MTU for a given connection (2/4)" into klp-modular-dev
* commit '
20222380588aa9a5e9b5e83b653e3c2a744da6aa':
LE: Add API to configure MTU for a given connection (2/4)
Mallikarjuna GB [Fri, 7 Feb 2014 19:47:26 +0000 (01:17 +0530)]
SDP: Allocate proper sized scratch buffer for SDP response
The buffer allocated for attribute response is being reused
for subsequent requests for an SDP connection. Check the
buffer size before using for subsequent requests and
reallocate if required.
Change-Id: Ib00aff2c4512192c29265cf0adb89e380adf0b35
Zhihai Xu [Mon, 31 Mar 2014 21:28:48 +0000 (21:28 +0000)]
am
2011d136: Merge "LE: Add API to configure MTU for a given connection (2/4)" into klp-modular-dev
* commit '
2011d136791ec93c0670edc00e64122415c926a0':
LE: Add API to configure MTU for a given connection (2/4)
Zhihai Xu [Mon, 31 Mar 2014 21:22:21 +0000 (21:22 +0000)]
Merge "LE: Add API to configure MTU for a given connection (2/4)" into klp-modular-dev
Matthew Xie [Mon, 31 Mar 2014 20:02:38 +0000 (20:02 +0000)]
am
f003a729: am
06589f6c: Merge "Bluetooth: Clear wait flag on Start response."
* commit '
f003a7292ca3fe7e7633b28c2d35e6314365dc8b':
Bluetooth: Clear wait flag on Start response.
Matthew Xie [Mon, 31 Mar 2014 19:56:06 +0000 (19:56 +0000)]
am
06589f6c: Merge "Bluetooth: Clear wait flag on Start response."
* commit '
06589f6c61579105aa10e35960d59a408f9eff52':
Bluetooth: Clear wait flag on Start response.
Matthew Xie [Mon, 31 Mar 2014 19:45:33 +0000 (19:45 +0000)]
Merge "Bluetooth: Clear wait flag on Start response."
Andre Eisenbach [Tue, 25 Mar 2014 13:31:17 +0000 (06:31 -0700)]
LE: Add API to configure MTU for a given connection (2/4)
bug:
13571470
Change-Id: I932905590ee9c40cb67e7d09715c0f8e59d2f662
Eric Laurent [Wed, 26 Mar 2014 01:36:27 +0000 (18:36 -0700)]
audio: fix set_parameters return value.
xxx_set_parameters functions were returning the status
returned by str_parms_create_str() which is incorrect.
These functions should return 0 when no error occurs.
Change-Id: I984d95457c985fbaf1a15baa522f8a84f99dd7c9
Shobek Sam Attupurath [Wed, 17 Apr 2013 10:38:17 +0000 (16:08 +0530)]
Use 0000 as pin key for PORCHE_PAIRING_CONFLICT issue
For PORCHE_PAIRING_CONFLICT issue when there are no other paired devices
available in bluetooth list pairing always fails (as per implementation
in bluedroid stack).
In this case when pin key request is received use 0000 as the pin key
so that pairing is successful.
Bug 67614
Change-Id: I67b2e689cfcc52c93fdda62dd742812698baa0e6
Matthew Xie [Mon, 24 Mar 2014 22:54:33 +0000 (22:54 +0000)]
am
2e3eaf6c: am
0b151acc: am
335a8a6c: resolved conflicts for merge of
f4471c7e to klp-modular-dev
* commit '
2e3eaf6c4524623ed356eed5a429dfc17992caa7':
DO NOT MERGE Allow simultaneous LE Observe and BTM Inquiry/Scan
Matthew Xie [Mon, 24 Mar 2014 19:47:57 +0000 (19:47 +0000)]
am
0b151acc: am
335a8a6c: resolved conflicts for merge of
f4471c7e to klp-modular-dev
* commit '
0b151accb74f3c2cfc78ec538a11e2949efd71e1':
DO NOT MERGE Allow simultaneous LE Observe and BTM Inquiry/Scan
Matthew Xie [Mon, 24 Mar 2014 19:44:57 +0000 (19:44 +0000)]
am
335a8a6c: resolved conflicts for merge of
f4471c7e to klp-modular-dev
* commit '
335a8a6c08abfbea29dead003b4fa95fca786ccd':
DO NOT MERGE Allow simultaneous LE Observe and BTM Inquiry/Scan
Matthew Xie [Mon, 24 Mar 2014 19:37:40 +0000 (12:37 -0700)]
resolved conflicts for merge of
f4471c7e to klp-modular-dev
Change-Id: I89ce6df8f59efa8cee63775eff58262ecf438db3
Nitin Arora [Sat, 22 Mar 2014 02:58:58 +0000 (02:58 +0000)]
am
f4471c7e: DO NOT MERGE Allow simultaneous LE Observe and BTM Inquiry/Scan
* commit '
f4471c7e6ca7a0bd4846b2fe4fbe78d79ef37b81':
DO NOT MERGE Allow simultaneous LE Observe and BTM Inquiry/Scan
Nitin Arora [Sat, 22 Feb 2014 02:20:37 +0000 (18:20 -0800)]
DO NOT MERGE Allow simultaneous LE Observe and BTM Inquiry/Scan
This patch allows BTM inquiry and LE observe to be launched
and overlap each others' occurance by redirecting results
and handling states accordingly.
CRs-Fixed: 579505
Conflicts:
stack/btm/btm_ble_gap.c
bug
12939764
Change-Id: Ifde73f17f8d40e9ebfff3b49e409591189574ee0
Nitin Arora [Sat, 22 Feb 2014 02:20:37 +0000 (18:20 -0800)]
Allow simultaneous LE Observe and BTM Inquiry/Scan
This patch allows BTM inquiry and LE observe to be launched
and overlap each others' occurance by redirecting results
and handling states accordingly.
CRs-Fixed: 579505
Conflicts:
stack/btm/btm_ble_gap.c
bug
12939764
Change-Id: Ifde73f17f8d40e9ebfff3b49e409591189574ee0
Zhihai Xu [Fri, 21 Mar 2014 20:24:10 +0000 (20:24 +0000)]
am
8e01899e: am
a27730b4: am
67467172: Merge "print MTU size after get MTU request from iphone." into klp-modular-dev
* commit '
8e01899e4b152b318d1cbe0ad1be98c88fb62cd2':
print MTU size after get MTU request from iphone.
Zhihai Xu [Fri, 21 Mar 2014 16:04:09 +0000 (16:04 +0000)]
am
a27730b4: am
67467172: Merge "print MTU size after get MTU request from iphone." into klp-modular-dev
* commit '
a27730b49bdd3cfeeefc2efa90e3cb196800a8dd':
print MTU size after get MTU request from iphone.
Zhihai Xu [Fri, 21 Mar 2014 15:59:54 +0000 (15:59 +0000)]
am
67467172: Merge "print MTU size after get MTU request from iphone." into klp-modular-dev
* commit '
6746717209435aac27eedeebdf67da1a1fbc5e5a':
print MTU size after get MTU request from iphone.
Zhihai Xu [Fri, 21 Mar 2014 15:55:48 +0000 (15:55 +0000)]
Merge "print MTU size after get MTU request from iphone." into klp-modular-dev
Eric Laurent [Fri, 21 Mar 2014 01:23:00 +0000 (01:23 +0000)]
Merge "a2dp audio HAL: use correct interface version"
Eric Laurent [Fri, 21 Mar 2014 01:01:09 +0000 (18:01 -0700)]
a2dp audio HAL: use correct interface version
Do not use AUDIO_DEVICE_API_VERSION_CURRENT version
but AUDIO_DEVICE_API_VERSION_2_0 to reflect the version
actually implemeted.
Change-Id: I31407af7fc4769be1d259ee739422ce9f598be2e
Zhihai Xu [Fri, 21 Mar 2014 00:50:12 +0000 (17:50 -0700)]
print MTU size after get MTU request from iphone.
bug:
13568537
Change-Id: If1a4e93b7ef53662bd740da0d3bb91fe747de031
Andre Eisenbach [Thu, 20 Mar 2014 21:05:08 +0000 (21:05 +0000)]
am
c0932faf: (-s ours) am
64ed2414: am
67020954: am
a4611ac0: DO NOT MERGE: cherrypick from master to fix b/
13289050
* commit '
c0932fafefc12f8ed8597d404d1392e367ba7136':
DO NOT MERGE: cherrypick from master to fix b/
13289050
Andre Eisenbach [Thu, 20 Mar 2014 16:38:01 +0000 (16:38 +0000)]
am
a4611ac0: DO NOT MERGE: cherrypick from master to fix b/
13289050
* commit '
a4611ac05f07360785adcff8640da01a3894e4c5':
DO NOT MERGE: cherrypick from master to fix b/
13289050
Andre Eisenbach [Thu, 20 Mar 2014 16:33:51 +0000 (16:33 +0000)]
am
64ed2414: am
67020954: am
a4611ac0: DO NOT MERGE: cherrypick from master to fix b/
13289050
* commit '
64ed24148d570f5a1c8ebeb2f0336b24ecc95b9c':
DO NOT MERGE: cherrypick from master to fix b/
13289050