OSDN Git Service
Vinit Deshpande [Mon, 16 Mar 2015 08:14:25 +0000 (01:14 -0700)]
Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'
Rakesh Iyer [Thu, 12 Mar 2015 16:59:39 +0000 (16:59 +0000)]
Merge "Fix build when BT_AV_SINK is enabled."
Conley Owens [Wed, 11 Mar 2015 22:17:36 +0000 (22:17 +0000)]
am
3e5bdbcc: am
2c0b232e: am
57ed41b9: Merge "Add NOTICE and MODULE_LICENSE files"
* commit '
3e5bdbcc31a262b2854dcb22dd32e58b0e1475b8':
Add NOTICE and MODULE_LICENSE files
Rakesh Iyer [Tue, 10 Mar 2015 22:07:43 +0000 (15:07 -0700)]
Fix build when BT_AV_SINK is enabled.
Change-Id: I3662ad190e5af86d2765321d9df8aca1e6c066b8
Natalie Silvanovich [Tue, 10 Mar 2015 18:15:15 +0000 (18:15 +0000)]
am
d8d98105: am
1e868f87: am
0cd5a85e: (-s ours) Merge "Change pairing_cb to assume temporary pairing by default"
* commit '
d8d98105ba5fd2f03ee5babc59227d220973f210':
Change pairing_cb to assume temporary pairing by default
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:28:54 +0000 (00:28 +0000)]
am
69ce4008: (-s ours) am
a40848a8: (-s ours) DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (2/4)
* commit '
69ce4008c17940226fd9b90bb139068bf8eef575':
DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (2/4)
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
Ian Coolidge [Wed, 4 Mar 2015 01:00:17 +0000 (17:00 -0800)]
Don't truncate the top 16 bits of the LE advertisement data mask.
This is stored elsewhere as unsigned 32-bit integer.
It should be stored the same way here.
Bug:
19592970
Change-Id: I34136ca76e56f9a5cd896138c947c46e7912d40a
Erik Kline [Tue, 3 Mar 2015 03:39:35 +0000 (03:39 +0000)]
am
6f846a8f: am
3210f865: am
3e12cd50: Merge "reword channle to channel"
* commit '
6f846a8f9f70a00166a8395d2ad64c81ef262801':
reword channle to channel
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:13:58 +0000 (03:13 +0000)]
am
3fdf6f6f: am
098f6a78: Fix the GCC build after fixing the clang build.
* commit '
3fdf6f6f154f7d66956c201f5b6da669ac3d79ab':
Fix the GCC build after fixing the clang build.
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:19:51 +0000 (01:19 +0000)]
am
79c42f93: am
15f13389: Ignore typdef redefintion warning to fix build.
* commit '
79c42f9375efcb8437f1d7c35e4d7bcb84955e25':
Ignore typdef redefintion warning to fix build.
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 20:26:56 +0000 (20:26 +0000)]
am
7f0bed24: am
45085bf6: Merge "Ignore service UUID length if no UUID filter is specified" into lmp-mr1-dev
* commit '
7f0bed2474013b96357cf5c499e9b6dbae47c406':
Ignore service UUID length if no UUID filter is specified
Andre Eisenbach [Thu, 19 Feb 2015 20:26:19 +0000 (20:26 +0000)]
am
f3815f98: am
114c9ce4: Merge "Increase SDP buffer from 750 bytes to 4096 bytes" into lmp-mr1-dev
* commit '
f3815f98c16716b14b2fab5820e52e9907eb8cc4':
Increase SDP buffer from 750 bytes to 4096 bytes
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:48:38 +0000 (04:48 +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 02:14:02 +0000 (02:14 +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: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:55:25 +0000 (00:55 +0000)]
am
1b8b1397: am
dfb3b2f2: Add flag indicating encrypted connections to btif_dm_get_connection_state()
* commit '
1b8b1397dad3ba82ec2b7d10233922e13cf510cf':
Add flag indicating encrypted connections to btif_dm_get_connection_state()
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()
Andre Eisenbach [Tue, 10 Feb 2015 00:27:01 +0000 (00:27 +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 [Mon, 9 Feb 2015 04:14:44 +0000 (04:14 +0000)]
am
2b5cc8ee: am
d736b8d6: Merge "Fix some more missing libc includes."
* commit '
2b5cc8eed709a691702734d6caeab07609c7acb8':
Fix some more missing libc includes.
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 13:31:44 +0000 (13:31 +0000)]
am
e78115f7: (-s ours) 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 '
e78115f70021ec1c58b8447b7bd766633157fac3':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
Andre Eisenbach [Fri, 6 Feb 2015 13:31:43 +0000 (13:31 +0000)]
am
277005e4: (-s ours) 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 '
277005e40d677bcd7c982822bd2a4b2cc2e47609':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
Andre Eisenbach [Fri, 6 Feb 2015 13:31:42 +0000 (13:31 +0000)]
am
5be46131: (-s ours) am
0ad6cfde: am
ce5ae4ab: am
a708936d: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit '
5be461319d94b47756326422aafb9203323d3d06':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
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 05:02:29 +0000 (05:02 +0000)]
am
d6f2fa93: (-s ours) 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 [Thu, 5 Feb 2015 04:52:37 +0000 (04:52 +0000)]
am
e791f732: (-s ours) 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 [Thu, 5 Feb 2015 04:52:25 +0000 (04:52 +0000)]
am
0ad6cfde: (-s ours) 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 15:04:03 +0000 (15:04 +0000)]
am
b68105ca: am
ff50e75d: Merge "Fix pthread_t confusion."
* commit '
b68105ca4a4fc37da18321472e2f823c6c0f4c40':
Fix pthread_t confusion.
Elliott Hughes [Wed, 4 Feb 2015 15:03:57 +0000 (15:03 +0000)]
am
40cc4084: am
481b0546: Merge "Fix non-standard pthread mutex interactions."
* commit '
40cc40843d88f79b151b7880f33e59a96f4f0182':
Fix non-standard pthread mutex interactions.
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:30:49 +0000 (16:30 +0000)]
am
df61acbd: am
1efdda75: Merge "btif_pan: Grab interface declarations from net/if.h only."
* commit '
df61acbd523271cc9b01b81dbbf5c45799bee6b5':
btif_pan: Grab interface declarations from net/if.h only.
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 05:01:27 +0000 (05:01 +0000)]
am
c83aa652: am
a51404cf: Merge "Add missing <string.h> includes."
* commit '
c83aa65214a930e3b80e7a2c53f78d79e6e28640':
Add missing <string.h> includes.
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:21:07 +0000 (01:21 +0000)]
am
d7884653: am
17d85406: Merge "bta_dm_search_cancel sends dm_search state machine complete events" into lmp-mr1-dev
* commit '
d78846532fd66d05aa632b55264655b6481c8ac8':
bta_dm_search_cancel sends dm_search state machine complete events
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 17:22:06 +0000 (17:22 +0000)]
am
527a9db5: am
61331337: Merge "Add missing includes."
* commit '
527a9db58da0f7f43d835b24ceabb8e46010d248':
Add missing includes.
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:32:09 +0000 (18:32 +0000)]
am
7c582379: am
89363761: Change pairing_cb to assume temporary pairing by default
* commit '
7c5823798cccb6731a164edff7127ebfce074558':
Change pairing_cb to assume temporary pairing by default
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 21:00:47 +0000 (21:00 +0000)]
am
7fbc6954: am
f976082e: Merge "Fix omitted libc includes."
* commit '
7fbc6954fac90dd7148ac73aa478fcc5e2d75be8':
Fix omitted libc includes.
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."
OSDN Git Service
