OSDN Git Service
Andre Eisenbach [Fri, 20 Mar 2015 16:15:12 +0000 (16:15 +0000)]
am
02c53050: DO NOT MERGE - Remove ACL connection reference counting
* commit '
02c530503feb46150d013bf87b0570a781fb10ec':
DO NOT MERGE - Remove ACL connection reference counting
Andre Eisenbach [Thu, 12 Mar 2015 17:09:14 +0000 (10:09 -0700)]
DO NOT MERGE - Remove ACL connection reference counting
In addition to maintaining ACL link control blocks, which carry a
"in_use" flag, ACL links are reference counted in the num_acl links
variable.
The reference counting is thrown off when a SM connection initiated for
pairing is followed up by a GATT connection after pairing completes. The
2nd connection is counted against num_acl, even so other parts of the
code recognize the connection as a duplicate ACL connection to the same
BDA.
This patch removes the unecessary reference counting and relies on the
control block status instead, which is correctly maintained.
The BTM_BUSY_LEVEL_CHANGE_INCLUDED flag encapsulating the num_acl
tracking should be removed in the future.
Bug:
19019189
Change-Id: I4cc88c24f1c4d1273361d879bc62e9fade3f3ee9
Conley Owens [Tue, 10 Mar 2015 18:05:07 +0000 (18:05 +0000)]
am
2c0b232e: am
57ed41b9: Merge "Add NOTICE and MODULE_LICENSE files"
* commit '
2c0b232ee45d41c568731a0c433b96d9f02075b8':
Add NOTICE and MODULE_LICENSE files
Conley Owens [Tue, 10 Mar 2015 17:59:21 +0000 (17:59 +0000)]
am
57ed41b9: Merge "Add NOTICE and MODULE_LICENSE files"
* commit '
57ed41b9554aefdb7f881e15375d75b4c9dd58e9':
Add NOTICE and MODULE_LICENSE files
Conley Owens [Tue, 10 Mar 2015 17:54:12 +0000 (17:54 +0000)]
Merge "Add NOTICE and MODULE_LICENSE files"
Natalie Silvanovich [Mon, 9 Mar 2015 18:36:45 +0000 (18:36 +0000)]
am
1e868f87: am
0cd5a85e: (-s ours) Merge "Change pairing_cb to assume temporary pairing by default"
* commit '
1e868f87341adad554233fdb7448c3f41e7d3aa0':
Change pairing_cb to assume temporary pairing by default
Natalie Silvanovich [Mon, 9 Mar 2015 18:32:37 +0000 (18:32 +0000)]
am
0cd5a85e: (-s ours) Merge "Change pairing_cb to assume temporary pairing by default"
* commit '
0cd5a85ee83c1db54fb244300c072ef73c622861':
Change pairing_cb to assume temporary pairing by default
Natalie Silvanovich [Mon, 9 Mar 2015 18:23:15 +0000 (18:23 +0000)]
Merge "Change pairing_cb to assume temporary pairing by default"
Conley Owens [Sat, 7 Mar 2015 00:54:25 +0000 (16:54 -0800)]
Add NOTICE and MODULE_LICENSE files
Change-Id: I28284de20a047470e0afc9d4c0b088efe202eaaf
Andre Eisenbach [Mon, 26 Jan 2015 21:49:36 +0000 (13:49 -0800)]
Change pairing_cb to assume temporary pairing by default
When pairing takes place, the pairing_cb.is_temp flag indicates whether
a pairing is temporary or permanent. Link keys are not stored for
temporary pairings. Since this is a "positive" flag, resetting the
pairing_cb control block (ex. memset to 0), it will assume persistent
pairing by default. Under certain circumstances, this can lead to a link
key being stored for temporarily secured connection.
This patch reverses the flag to be a "negative" flag. Renamed to
"persistent_bond", the default 0 meaning is now used to indicate a
temporary bond. If the lag is not properly set now, it will default to a
temporary bond and will not save the link key erronously.
This fix is for CVE-2014-7914
Bug:
18345373
Change-Id: I6e821595877ff30d64dc6e33602ac049cab3dd1e
Andre Eisenbach [Thu, 5 Mar 2015 00:23:06 +0000 (00:23 +0000)]
am
a40848a8: (-s ours) DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (2/4)
* commit '
a40848a8810b95ad279d4294c8e6cbba2b09347a':
DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (2/4)
Andre Eisenbach [Fri, 5 Dec 2014 17:40:20 +0000 (09:40 -0800)]
DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (2/4)
Includes support for BTSnoop logging in memory.
Bug:
18508263
Change-Id: Iade200283dca3545b7bbd0872c583731eb115d34
Erik Kline [Tue, 3 Mar 2015 03:33:12 +0000 (03:33 +0000)]
am
3210f865: am
3e12cd50: Merge "reword channle to channel"
* commit '
3210f865592835629eae0e172dc55bbe1a822041':
reword channle to channel
Erik Kline [Tue, 3 Mar 2015 03:25:51 +0000 (03:25 +0000)]
am
3e12cd50: Merge "reword channle to channel"
* commit '
3e12cd500a06053da91f5cb69837838ea7455067':
reword channle to channel
Erik Kline [Tue, 3 Mar 2015 03:22:01 +0000 (03:22 +0000)]
Merge "reword channle to channel"
Erik Kline [Wed, 25 Feb 2015 07:34:08 +0000 (16:34 +0900)]
reword channle to channel
Change-Id: Ic45f99db717e1efcad4385cbbe1dd658e3a18bfb
Dan Albert [Fri, 20 Feb 2015 03:09:15 +0000 (03:09 +0000)]
am
098f6a78: Fix the GCC build after fixing the clang build.
* commit '
098f6a78457476a4d3eedf57e9efaad5681c9c67':
Fix the GCC build after fixing the clang build.
Dan Albert [Fri, 20 Feb 2015 02:02:52 +0000 (18:02 -0800)]
Fix the GCC build after fixing the clang build.
GCC doesn't know this flag, and apparently GCC only actually
complains about not knowing the flag if there is at least one warning
emitted.
Change-Id: Ic63b915d1f111fead46184ccd765d7a79fb531f9
Dan Albert [Fri, 20 Feb 2015 01:13:04 +0000 (01:13 +0000)]
am
15f13389: Ignore typdef redefintion warning to fix build.
* commit '
15f13389b9792c3734ff494d5ea93ffe1ba0f28d':
Ignore typdef redefintion warning to fix build.
Dan Albert [Fri, 20 Feb 2015 01:05:03 +0000 (17:05 -0800)]
Ignore typdef redefintion warning to fix build.
It redefines to the same type, so not a problem.
Change-Id: I6139816f02729573474957528a8ac782243b598b
Justin Harrison [Thu, 19 Feb 2015 05:01:24 +0000 (05:01 +0000)]
am
45085bf6: Merge "Ignore service UUID length if no UUID filter is specified" into lmp-mr1-dev
* commit '
45085bf6ed93ea9398047c21bc4b94c8516f9daa':
Ignore service UUID length if no UUID filter is specified
Justin Harrison [Thu, 19 Feb 2015 04:44:12 +0000 (04:44 +0000)]
Merge "Ignore service UUID length if no UUID filter is specified" into lmp-mr1-dev
Andre Eisenbach [Thu, 19 Feb 2015 01:35:19 +0000 (01:35 +0000)]
am
114c9ce4: Merge "Increase SDP buffer from 750 bytes to 4096 bytes" into lmp-mr1-dev
* commit '
114c9ce459e9d9e40d55586da1d18d0d65c45c8d':
Increase SDP buffer from 750 bytes to 4096 bytes
Andre Eisenbach [Thu, 19 Feb 2015 01:16:36 +0000 (01:16 +0000)]
Merge "Increase SDP buffer from 750 bytes to 4096 bytes" into lmp-mr1-dev
Andre Eisenbach [Thu, 19 Feb 2015 00:33:34 +0000 (16:33 -0800)]
Ignore service UUID length if no UUID filter is specified
Bug:
19016326
Change-Id: I6156fee1d6079fec7879f47b6120befe2c4d35cd
Andre Eisenbach [Tue, 10 Feb 2015 00:42:58 +0000 (00:42 +0000)]
am
dfb3b2f2: Add flag indicating encrypted connections to btif_dm_get_connection_state()
* commit '
dfb3b2f2595dc16fe7f576a4b0c2f5e73db0327f':
Add flag indicating encrypted connections to btif_dm_get_connection_state()
Christopher Ferris [Sat, 7 Feb 2015 01:23:27 +0000 (01:23 +0000)]
am
d736b8d6: Merge "Fix some more missing libc includes."
* commit '
d736b8d6b3f95b7af19b75a613486b023279c3ee':
Fix some more missing libc includes.
Christopher Ferris [Sat, 7 Feb 2015 01:15:17 +0000 (01:15 +0000)]
Merge "Fix some more missing libc includes."
Ian Coolidge [Fri, 6 Feb 2015 08:28:47 +0000 (00:28 -0800)]
Fix some more missing libc includes.
stddef and signal are not pulled in transitively in glibc.
Change-Id: I7a834bbdc31ae2aee4cb700a223c1636fda42afa
Andre Eisenbach [Fri, 6 Feb 2015 04:00:45 +0000 (20:00 -0800)]
Add flag indicating encrypted connections to btif_dm_get_connection_state()
Add a check to btif_dm_get_connection_state() to see if the currently
active connection is encrypted.
Bug:
19186961
Change-Id: I27bcc6e296d272ffd17c0bbe97631ffa4df57ccd
Andre Eisenbach [Fri, 6 Feb 2015 00:06:48 +0000 (00:06 +0000)]
am
d6f2fa93: am
d6419cd6: am
0a8c803a: am
7f34538a: (-s ours) am
65aec3a3: am
6d429d9d: (-s ours) am
3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit '
d6f2fa93052c1d9bdf6035ace6b32345013516db':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
Andre Eisenbach [Fri, 6 Feb 2015 00:06:47 +0000 (00:06 +0000)]
am
e791f732: am
ae9d174b: am
408dec19: am
977acabd: (-s ours) am
eebc8ab9: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit '
e791f73202a2832b4d20dbc1ecd4b520adbb75d3':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
Andre Eisenbach [Fri, 6 Feb 2015 00:06:47 +0000 (00:06 +0000)]
am
0ad6cfde: am
ce5ae4ab: am
a708936d: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit '
0ad6cfdee8857a7bc54d4c3eb98bf1cdc82dc9a7':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
Andre Eisenbach [Thu, 5 Feb 2015 04:38:21 +0000 (04:38 +0000)]
am
d6419cd6: am
0a8c803a: am
7f34538a: (-s ours) am
65aec3a3: am
6d429d9d: (-s ours) am
3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit '
d6419cd6309bd20a2ab095c783bb6ad1f208bf4f':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
Andre Eisenbach [Thu, 5 Feb 2015 04:32:54 +0000 (04:32 +0000)]
am
0a8c803a: am
7f34538a: (-s ours) am
65aec3a3: am
6d429d9d: (-s ours) am
3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit '
0a8c803a48fe5afa71d1f8660539012e9b1f9642':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
Andre Eisenbach [Thu, 5 Feb 2015 04:25:27 +0000 (04:25 +0000)]
am
7f34538a: (-s ours) am
65aec3a3: am
6d429d9d: (-s ours) am
3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit '
7f34538ac0e447a88d1f54ff819c28b3574f0aa4':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
Andre Eisenbach [Thu, 5 Feb 2015 04:21:04 +0000 (04:21 +0000)]
am
65aec3a3: am
6d429d9d: (-s ours) am
3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit '
65aec3a3f62c004d7073470f18330007b7ecf230':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
Andre Eisenbach [Thu, 5 Feb 2015 04:07:04 +0000 (04:07 +0000)]
am
ae9d174b: am
408dec19: am
977acabd: (-s ours) am
eebc8ab9: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit '
ae9d174bc0afe0a7ed0bb4fb82836338fbb6adb1':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
Andre Eisenbach [Thu, 5 Feb 2015 04:01:12 +0000 (04:01 +0000)]
am
408dec19: am
977acabd: (-s ours) am
eebc8ab9: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit '
408dec1991255be919b1605e5cfe983b7f7154e9':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
Andre Eisenbach [Thu, 5 Feb 2015 03:54:01 +0000 (03:54 +0000)]
am
977acabd: (-s ours) am
eebc8ab9: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit '
977acabd3744a3308057b1485c7ac8658698e96b':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
Andre Eisenbach [Thu, 5 Feb 2015 03:51:51 +0000 (03:51 +0000)]
am
6d429d9d: (-s ours) am
3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit '
6d429d9d0a1b537600c652dda2bc98d4c4ebd783':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
Andre Eisenbach [Thu, 5 Feb 2015 03:38:43 +0000 (03:38 +0000)]
am
eebc8ab9: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit '
eebc8ab9c5e362d721f8f606f0a564ca9aff89d9':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
Andre Eisenbach [Thu, 5 Feb 2015 03:26:29 +0000 (03:26 +0000)]
am
3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit '
3efb9e2e11471a67329ad17d48ffa79118ea76c6':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
Andre Eisenbach [Thu, 5 Feb 2015 02:24:38 +0000 (02:24 +0000)]
am
ce5ae4ab: am
a708936d: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit '
ce5ae4abddaab8865bb44c83d2d44e14b0d7536b':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
Andre Eisenbach [Thu, 5 Feb 2015 02:11:12 +0000 (02:11 +0000)]
am
a708936d: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit '
a708936da347b32f2a0811b5f33d9068c2b0de6f':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
Elliott Hughes [Wed, 4 Feb 2015 01:59:19 +0000 (01:59 +0000)]
am
ff50e75d: Merge "Fix pthread_t confusion."
* commit '
ff50e75d69b5cee253c213f91999e8f6f6129c58':
Fix pthread_t confusion.
Elliott Hughes [Wed, 4 Feb 2015 01:49:41 +0000 (01:49 +0000)]
Merge "Fix pthread_t confusion."
Elliott Hughes [Wed, 4 Feb 2015 01:32:38 +0000 (01:32 +0000)]
am
481b0546: Merge "Fix non-standard pthread mutex interactions."
* commit '
481b0546db69274145ee129d19bb03cce4763c6f':
Fix non-standard pthread mutex interactions.
Prerepa Viswanadham [Wed, 10 Dec 2014 23:34:48 +0000 (15:34 -0800)]
Increase SDP buffer from 750 bytes to 4096 bytes
Bug
18670169
Change-Id: Ida1a6a57dcce94339a190974af4565f14157cdc2
Elliott Hughes [Wed, 4 Feb 2015 01:21:37 +0000 (01:21 +0000)]
Merge "Fix non-standard pthread mutex interactions."
Ian Coolidge [Tue, 3 Feb 2015 04:41:11 +0000 (20:41 -0800)]
Fix pthread_t confusion.
Don't assign pthread_t to pid_t or UINT32.
Just use pthread_t throughout.
Change-Id: Icb8315c591b4131314c834beebd94f37651eaafb
Andre Eisenbach [Mon, 26 Jan 2015 21:49:36 +0000 (13:49 -0800)]
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
When pairing takes place, the pairing_cb.is_temp flag indicates whether
a pairing is temporary or permanent. Link keys are not stored for
temporary pairings. Since this is a "positive" flag, resetting the
pairing_cb control block (ex. memset to 0), it will assume persistent
pairing by default. Under certain circumstances, this can lead to a link
key being stored for temporarily secured connection.
This patch reverses the flag to be a "negative" flag. Renamed to
"persistent_bond", the default 0 meaning is now used to indicate a
temporary bond. If the lag is not properly set now, it will default to a
temporary bond and will not save the link key erronously.
Bug:
18345373
Change-Id: I06b1ba9331a70ebc29f4437bf836164658dec5ae
Andre Eisenbach [Mon, 26 Jan 2015 21:49:36 +0000 (13:49 -0800)]
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
When pairing takes place, the pairing_cb.is_temp flag indicates whether
a pairing is temporary or permanent. Link keys are not stored for
temporary pairings. Since this is a "positive" flag, resetting the
pairing_cb control block (ex. memset to 0), it will assume persistent
pairing by default. Under certain circumstances, this can lead to a link
key being stored for temporarily secured connection.
This patch reverses the flag to be a "negative" flag. Renamed to
"persistent_bond", the default 0 meaning is now used to indicate a
temporary bond. If the lag is not properly set now, it will default to a
temporary bond and will not save the link key erronously.
Bug:
18345373
Change-Id: I8558abc9eace609b1ba02485b0ff775fb6f3c6af
Andre Eisenbach [Mon, 26 Jan 2015 21:49:36 +0000 (13:49 -0800)]
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
When pairing takes place, the pairing_cb.is_temp flag indicates whether
a pairing is temporary or permanent. Link keys are not stored for
temporary pairings. Since this is a "positive" flag, resetting the
pairing_cb control block (ex. memset to 0), it will assume persistent
pairing by default. Under certain circumstances, this can lead to a link
key being stored for temporarily secured connection.
This patch reverses the flag to be a "negative" flag. Renamed to
"persistent_bond", the default 0 meaning is now used to indicate a
temporary bond. If the lag is not properly set now, it will default to a
temporary bond and will not save the link key erronously.
Bug:
18345373
Change-Id: Ifb61e7a23db07888a625db9ab851548600183136
Ian Coolidge [Tue, 3 Feb 2015 04:39:09 +0000 (20:39 -0800)]
Fix non-standard pthread mutex interactions.
pthread_mutex_t is intended to be opaque.
pthread_attr_t is intended to be opaque.
Change-Id: I9b4f32b695783a4391851269977aa748dcc4f241
Elliott Hughes [Tue, 3 Feb 2015 16:24:16 +0000 (16:24 +0000)]
am
1efdda75: Merge "btif_pan: Grab interface declarations from net/if.h only."
* commit '
1efdda75d0e7cf4223ba8958a56c2aeafa5129c5':
btif_pan: Grab interface declarations from net/if.h only.
Elliott Hughes [Tue, 3 Feb 2015 16:12:30 +0000 (16:12 +0000)]
Merge "btif_pan: Grab interface declarations from net/if.h only."
Ian Coolidge [Tue, 3 Feb 2015 04:50:42 +0000 (20:50 -0800)]
btif_pan: Grab interface declarations from net/if.h only.
This is the libc interface file.
Using linux/if.h produces definition collisions on glibc.
Elliott Hughes [Fri, 30 Jan 2015 04:55:17 +0000 (04:55 +0000)]
am
a51404cf: Merge "Add missing <string.h> includes."
* commit '
a51404cfa0fc6ffb504e76874be32977014c647f':
Add missing <string.h> includes.
Elliott Hughes [Fri, 30 Jan 2015 04:43:40 +0000 (04:43 +0000)]
Merge "Add missing <string.h> includes."
Elliott Hughes [Fri, 30 Jan 2015 04:40:25 +0000 (20:40 -0800)]
Add missing <string.h> includes.
Change-Id: Iebebb21a2fd04603e0170d7c3a9f6d9552f39c88
Prem Kumar [Fri, 30 Jan 2015 01:15:53 +0000 (01:15 +0000)]
am
17d85406: Merge "bta_dm_search_cancel sends dm_search state machine complete events" into lmp-mr1-dev
* commit '
17d854067162e27c2bf67fd61454ae7b76b79cea':
bta_dm_search_cancel sends dm_search state machine complete events
Prem Kumar [Fri, 30 Jan 2015 01:00:49 +0000 (01:00 +0000)]
Merge "bta_dm_search_cancel sends dm_search state machine complete events" into lmp-mr1-dev
Elliott Hughes [Thu, 29 Jan 2015 01:53:18 +0000 (01:53 +0000)]
am
61331337: Merge "Add missing includes."
* commit '
61331337c05cde410665e6a533a338b867fad45c':
Add missing includes.
Elliott Hughes [Thu, 29 Jan 2015 01:40:04 +0000 (01:40 +0000)]
Merge "Add missing includes."
Elliott Hughes [Wed, 28 Jan 2015 23:31:26 +0000 (15:31 -0800)]
Add missing includes.
Change-Id: I041a5ea84b82155b0a7a8c4e7dc416c2c2b5e251
Matthew Xie [Thu, 29 Jan 2015 01:30:13 +0000 (17:30 -0800)]
bta_dm_search_cancel sends dm_search state machine complete events
bta_dm_search_cancel moves dm_search state from active search to
search_canceling state. The function is also responsible of moving
the state out of canceling state.
Bug:
19017339
Change-Id: Idea0cb0e2987892a5fc0f66db8eed19f57c68b89
Andre Eisenbach [Wed, 28 Jan 2015 18:25:28 +0000 (18:25 +0000)]
am
89363761: Change pairing_cb to assume temporary pairing by default
* commit '
893637614568b8ac7dc996c2e9bdbde481fbdc08':
Change pairing_cb to assume temporary pairing by default
Andre Eisenbach [Mon, 26 Jan 2015 21:49:36 +0000 (13:49 -0800)]
Change pairing_cb to assume temporary pairing by default
When pairing takes place, the pairing_cb.is_temp flag indicates whether
a pairing is temporary or permanent. Link keys are not stored for
temporary pairings. Since this is a "positive" flag, resetting the
pairing_cb control block (ex. memset to 0), it will assume persistent
pairing by default. Under certain circumstances, this can lead to a link
key being stored for temporarily secured connection.
This patch reverses the flag to be a "negative" flag. Renamed to
"persistent_bond", the default 0 meaning is now used to indicate a
temporary bond. If the lag is not properly set now, it will default to a
temporary bond and will not save the link key erronously.
Bug:
18345373
Change-Id: I6e821595877ff30d64dc6e33602ac049cab3dd1e
Elliott Hughes [Sun, 25 Jan 2015 20:43:04 +0000 (20:43 +0000)]
am
f976082e: Merge "Fix omitted libc includes."
* commit '
f976082eead2b7c19bf8c00d79e4723e6c4eb8e9':
Fix omitted libc includes.
Elliott Hughes [Sun, 25 Jan 2015 16:14:13 +0000 (16:14 +0000)]
Merge "Fix omitted libc includes."
Ian Coolidge [Sat, 24 Jan 2015 10:01:26 +0000 (02:01 -0800)]
Fix omitted libc includes.
Change-Id: I72c08984aeef60e4833e600b4351759b9687a014
Andre Eisenbach [Thu, 15 Jan 2015 23:47:45 +0000 (23:47 +0000)]
am
335bc32b: Merge "Relax max PCM frames per tick a bit" into lmp-mr1-dev
* commit '
335bc32bc7dae893358bde20557927e6ed6ad58c':
Relax max PCM frames per tick a bit
Andre Eisenbach [Thu, 15 Jan 2015 23:37:10 +0000 (23:37 +0000)]
Merge "Relax max PCM frames per tick a bit" into lmp-mr1-dev
Andre Eisenbach [Mon, 12 Jan 2015 23:31:30 +0000 (23:31 +0000)]
am
5d5b041c: LE: Add error status to failed write operation
* commit '
5d5b041ca497013df4ecfeb415db3843d0a90eb3':
LE: Add error status to failed write operation
Andre Eisenbach [Mon, 12 Jan 2015 21:34:01 +0000 (13:34 -0800)]
LE: Add error status to failed write operation
Bug:
18833375
Change-Id: Ib91c8e92658a276d813954264897b02863f1148b
Andre Eisenbach [Wed, 7 Jan 2015 22:30:28 +0000 (14:30 -0800)]
Relax max PCM frames per tick a bit
Also made the value overwrite-able in bt_target.h.
Bug:
18913091
Change-Id: I64bbe453b35fdce6f127b3c23c0552b14d4ac49b
Tobias Melin [Tue, 6 Jan 2015 21:14:26 +0000 (21:14 +0000)]
am
2cfcf51e: Added check if the device address is random
* commit '
2cfcf51ea3447f2b5cf95dbe7515d230de1e7df7':
Added check if the device address is random
Elliott Hughes [Tue, 30 Dec 2014 12:25:44 +0000 (12:25 +0000)]
am
5ad6d725: Merge "Fix missing #includes in external/bluetooth."
* commit '
5ad6d72549feb5c0f49f654edd177d98907a1586':
Fix missing #includes in external/bluetooth.
Elliott Hughes [Mon, 29 Dec 2014 21:18:23 +0000 (21:18 +0000)]
Merge "Fix missing #includes in external/bluetooth."
Elliott Hughes [Mon, 29 Dec 2014 20:32:48 +0000 (12:32 -0800)]
Fix missing #includes in external/bluetooth.
Change-Id: I5b1f75efb4b0f595a6e47849b4d8393a8d1dca24
Tobias Melin [Wed, 17 Dec 2014 10:24:31 +0000 (11:24 +0100)]
Added check if the device address is random
A check if the device address is random is needed since in a
public device address the two most significatant bits can also be
equal to 01 (see Bluetooth specification Core_v4.1.pdf, page 2021
and page 2500).
Bug:
18784040
Change-Id: I4f967a426ebb825731461e202c0741ae0540ef6a
Andre Eisenbach [Wed, 17 Dec 2014 17:10:11 +0000 (17:10 +0000)]
am
01a069a2: Allow connection parameters updates by slave
* commit '
01a069a228cb63988e502aed01a73a2a1d8a59eb':
Allow connection parameters updates by slave
Andre Eisenbach [Wed, 17 Dec 2014 00:18:10 +0000 (16:18 -0800)]
Allow connection parameters updates by slave
GATT service discovery in the slave role does not update to fast connection
parameters when connected. Accordin to the 4.0 spec, the connection
parameter disable/enable call is used for only by the masster role.
The 4.1 and later spec allows the slave role to control the connection
parameter update so that a slave role GATT client can perform the service
discovery using fast connection parameters.
Also switched to requestiong 7.5ms connection interval by default during
service discovery.
Bug:
18266904
Change-Id: Ie6300587306be3d694937e3888069e252592be42
Ying Wang [Tue, 16 Dec 2014 21:06:02 +0000 (21:06 +0000)]
am
6f65f670: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit '
6f65f6706f125f4319f041eec51e95655d36c390':
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Ying Wang [Tue, 16 Dec 2014 20:51:01 +0000 (20:51 +0000)]
Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
Ying Wang [Tue, 16 Dec 2014 20:31:51 +0000 (12:31 -0800)]
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Bug:
18675947
Change-Id: Iba2a3e4b07b4d11e6584ca3c19f85c82030faa04
Chih-Hung Hsieh [Thu, 11 Dec 2014 22:33:58 +0000 (14:33 -0800)]
resolved conflicts for merge of
ed0bdd42 to lmp-mr1-dev-plus-aosp
Change-Id: Ife8b72d3688ed78a95ccb8d5e0b60f40e7fec9e9
Chih-hung Hsieh [Thu, 11 Dec 2014 21:42:46 +0000 (21:42 +0000)]
Merge "Cleanups needed to make clang happy"
Andre Eisenbach [Wed, 10 Dec 2014 03:32:34 +0000 (03:32 +0000)]
am
40053090: Merge "LE: Register for service change indication" into lmp-mr1-dev
* commit '
40053090c5e4faaf0b1906164569666ae722e6fa':
LE: Register for service change indication
Andre Eisenbach [Wed, 10 Dec 2014 03:32:33 +0000 (03:32 +0000)]
am
a7246ca2: Do not log LE encryption keys or passkey
* commit '
a7246ca21d7570a725a9b7781649d194357e474c':
Do not log LE encryption keys or passkey
Andre Eisenbach [Tue, 9 Dec 2014 23:16:09 +0000 (23:16 +0000)]
Merge "LE: Register for service change indication" into lmp-mr1-dev
Andre Eisenbach [Tue, 9 Dec 2014 22:08:58 +0000 (14:08 -0800)]
Do not log LE encryption keys or passkey
Bug:
18687167
Change-Id: I2a2a7113e6bc7cfb22a6bd6f16d16ce2b7c84cff
Andre Eisenbach [Mon, 8 Dec 2014 19:18:07 +0000 (19:18 +0000)]
am
0668d3a9: LE: Ignore non-volatile GATT service cache for non-bonded devices
* commit '
0668d3a90a69b7dd57eae977c536dc7df043765f':
LE: Ignore non-volatile GATT service cache for non-bonded devices
Chaojing Sun [Sat, 6 Dec 2014 01:12:36 +0000 (17:12 -0800)]
LE: Register for service change indication
Some bonded remote devices require the client to register for service
change indication and actually set the client configuration descriptor
before service change indications can be removed.
This change add an additional step after device bonding has occured to
register for service change indication if possible.
Bug:
18173911
Change-Id: I25386faec0d58834ee2b0a9d1db2d2e052311264
Bernhard Rosenkränzer [Wed, 12 Nov 2014 20:53:08 +0000 (21:53 +0100)]
Cleanups needed to make clang happy
This patch removes a slew of unused variables and some unused functions,
fixes some incomplete initializations of structs and an sprintf
parameter mismatching the format string.
Change-Id: I35f22fdccc8350f885cd357d3685b869224fa433
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Andre Eisenbach [Fri, 5 Dec 2014 21:40:14 +0000 (21:40 +0000)]
am
a4fa77d1: am
cf7f6a15: Prevent Java call for acquiring already held wakelock
* commit '
a4fa77d1bc661bc72e00e81ce17af0ac4569d41d':
Prevent Java call for acquiring already held wakelock
Andreas Gampe [Fri, 5 Dec 2014 19:28:11 +0000 (19:28 +0000)]
am
d32ffc7e: Merge "Bluetooth: Turn off unused-XXX warnings"
* commit '
d32ffc7e0661f6fa60ca3fe36acb14d2be953564':
Bluetooth: Turn off unused-XXX warnings
Andreas Gampe [Fri, 5 Dec 2014 19:15:29 +0000 (19:15 +0000)]
Merge "Bluetooth: Turn off unused-XXX warnings"
Andreas Gampe [Fri, 5 Dec 2014 01:55:57 +0000 (17:55 -0800)]
Bluetooth: Turn off unused-XXX warnings
For build-system CFLAGS clean-up, disable warnings locally.
Should be reverted when the code is fixed.
Bug:
18632512
Change-Id: I2356dbbe89d1ccec5b0bd0b60ab06bf57ce021d1