OSDN Git Service
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: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 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.
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
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."
Ian Coolidge [Sat, 24 Jan 2015 10:01:26 +0000 (02:01 -0800)]
Fix omitted libc includes.
Change-Id: I72c08984aeef60e4833e600b4351759b9687a014
Andre Eisenbach [Fri, 16 Jan 2015 00:06:32 +0000 (00:06 +0000)]
am
fb17c122: am
335bc32b: Merge "Relax max PCM frames per tick a bit" into lmp-mr1-dev
* commit '
fb17c122b09171492d99b208c1fdd6b76d2c431c':
Relax max PCM frames per tick a bit
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 [Tue, 13 Jan 2015 20:32:27 +0000 (20:32 +0000)]
am
09dd8cbc: am
5d5b041c: LE: Add error status to failed write operation
* commit '
09dd8cbca5f6846fc0eb7a6dccb6d8426aeb418e':
LE: Add error status to failed write operation
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:21:22 +0000 (21:21 +0000)]
am
f68506e2: am
2cfcf51e: Added check if the device address is random
* commit '
f68506e24bc8e9783b40202d01b4154f9f24940a':
Added check if the device address is random
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:32:31 +0000 (12:32 +0000)]
am
57fa9378: am
5ad6d725: Merge "Fix missing #includes in external/bluetooth."
* commit '
57fa937805059dcd2b46ee9eec86c81041354482':
Fix missing #includes in external/bluetooth.
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:16:16 +0000 (17:16 +0000)]
am
ef8bca3b: am
01a069a2: Allow connection parameters updates by slave
* commit '
ef8bca3b5da0e2a9907349bff331b20874367581':
Allow connection parameters updates by slave
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:50:15 +0000 (21:50 +0000)]
am
a32e3c12: am
6f65f670: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit '
a32e3c12db0411bff2c32b6df1baf50106596cdb':
Cleanup Obsolete LOCAL_PRELINK_MODULE.
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:44:42 +0000 (22:44 +0000)]
am
11cf5ccd: resolved conflicts for merge of
ed0bdd42 to lmp-mr1-dev-plus-aosp
* commit '
11cf5ccd5cd6dd1568bf69e4b6cbc27c95f5026d':
Cleanups needed to make clang happy
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 21:56:05 +0000 (21:56 +0000)]
am
803434b0: am
40053090: Merge "LE: Register for service change indication" into lmp-mr1-dev
* commit '
803434b0e3334a7bdb7ebbcf9e312b4adfcee08f':
LE: Register for service change indication
Andre Eisenbach [Wed, 10 Dec 2014 21:56:04 +0000 (21:56 +0000)]
am
c1733c49: am
a7246ca2: Do not log LE encryption keys or passkey
* commit '
c1733c49213c04700a3ad8e248d391838d3ad125':
Do not log LE encryption keys or passkey
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 [Tue, 9 Dec 2014 00:57:29 +0000 (00:57 +0000)]
am
544b9ff4: am
0668d3a9: LE: Ignore non-volatile GATT service cache for non-bonded devices
* commit '
544b9ff446a8b2317e4264b25a5d12e6b0c76e16':
LE: Ignore non-volatile GATT service cache for non-bonded devices
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:50:02 +0000 (21:50 +0000)]
am
301c55e4: am
a4fa77d1: am
cf7f6a15: Prevent Java call for acquiring already held wakelock
* commit '
301c55e4053f496496db67923f1d80313b348ce6':
Prevent Java call for acquiring already held wakelock
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:36:48 +0000 (19:36 +0000)]
am
6bf8a5e0: am
d32ffc7e: Merge "Bluetooth: Turn off unused-XXX warnings"
* commit '
6bf8a5e01c15db12aaf7b3b42256f5fa99409685':
Bluetooth: Turn off unused-XXX warnings
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
Matthew Xie [Fri, 5 Dec 2014 00:15:36 +0000 (00:15 +0000)]
am
2f51cdec: am
d6984958: Merge "Revert "Correct the OBEX OPP Profile version""
* commit '
2f51cdec0acc9c43c2986ed24b3019719bb4b2d7':
Revert "Correct the OBEX OPP Profile version"
Wei Wang [Fri, 5 Dec 2014 00:14:44 +0000 (00:14 +0000)]
am
6fadce76: am
e608a529: Merge "Remove unnecessary check of multiple advertise instance count." into lmp-mr1-dev
* commit '
6fadce76d56cebb4821856127cd89a2eada3d80a':
Remove unnecessary check of multiple advertise instance count.
Andre Eisenbach [Thu, 4 Dec 2014 23:04:23 +0000 (15:04 -0800)]
LE: Ignore non-volatile GATT service cache for non-bonded devices
If a device is not bonded, the non-volatile GATT service cache should
not be used. Only bonded devices have the capability to invalidate the
cache using the service changed indication.
Bug:
18571592
Change-Id: Ia75aa14f1c862a18237e78d24b63c22cf1dc82a8
Matthew Xie [Thu, 4 Dec 2014 22:44:52 +0000 (22:44 +0000)]
am
d6984958: Merge "Revert "Correct the OBEX OPP Profile version""
* commit '
d6984958c38b202d47cdce002429006d5a8ede9e':
Revert "Correct the OBEX OPP Profile version"
Wei Wang [Thu, 4 Dec 2014 21:47:37 +0000 (21:47 +0000)]
am
e608a529: Merge "Remove unnecessary check of multiple advertise instance count." into lmp-mr1-dev
* commit '
e608a529718bb64accdf9f18cb196a9a3c45c90e':
Remove unnecessary check of multiple advertise instance count.
Andre Eisenbach [Thu, 4 Dec 2014 21:37:25 +0000 (21:37 +0000)]
am
cf7f6a15: Prevent Java call for acquiring already held wakelock
* commit '
cf7f6a154aed48659260d391994dc59151be937b':
Prevent Java call for acquiring already held wakelock
Matthew Xie [Thu, 4 Dec 2014 20:46:11 +0000 (20:46 +0000)]
am
5faeaa87: am
8a75ab5b: Merge "PAN TAP fd is not monitored in all cases" into lmp-mr1-dev
* commit '
5faeaa8755679cef4d4aa529db813973b7f59380':
PAN TAP fd is not monitored in all cases
Matthew Xie [Thu, 4 Dec 2014 20:25:02 +0000 (20:25 +0000)]
am
8a75ab5b: Merge "PAN TAP fd is not monitored in all cases" into lmp-mr1-dev
* commit '
8a75ab5b918c4e65e1b8fe55ec193b047ddfcb06':
PAN TAP fd is not monitored in all cases
Matthew Xie [Thu, 4 Dec 2014 19:53:02 +0000 (19:53 +0000)]
Merge "Revert "Correct the OBEX OPP Profile version""
Matthew Xie [Thu, 4 Dec 2014 07:59:14 +0000 (23:59 -0800)]
resolved conflicts for merge of
3c70ace5 to master
Change-Id: I58e5d99e8caa7775b075ac5e149535cb935229ee
Wei Wang [Thu, 4 Dec 2014 01:42:56 +0000 (01:42 +0000)]
Merge "Remove unnecessary check of multiple advertise instance count." into lmp-mr1-dev
Andre Eisenbach [Wed, 3 Dec 2014 18:35:53 +0000 (10:35 -0800)]
Prevent Java call for acquiring already held wakelock
Change-Id: Icf455b6aa7c0c1bf7abf7ea9700cfde17f6c7c2b
Matthew Xie [Wed, 3 Dec 2014 22:15:11 +0000 (22:15 +0000)]
Merge "PAN TAP fd is not monitored in all cases" into lmp-mr1-dev
Matthew Xie [Wed, 3 Dec 2014 20:42:06 +0000 (20:42 +0000)]
am
26d5c34a: Merge "Make GKI_TIMER_INTERVAL_FOR_WAKELOCK configurable for different target" into lmp-mr1-dev
* commit '
26d5c34af44bd1d5b430d15f3ac0942108159542':
Make GKI_TIMER_INTERVAL_FOR_WAKELOCK configurable for different target
Matthew Xie [Wed, 3 Dec 2014 04:18:03 +0000 (04:18 +0000)]
Merge "Make GKI_TIMER_INTERVAL_FOR_WAKELOCK configurable for different target" into lmp-mr1-dev
Matthew Xie [Wed, 3 Dec 2014 01:06:03 +0000 (17:06 -0800)]
Make GKI_TIMER_INTERVAL_FOR_WAKELOCK configurable for different target
Set the default value as 3000 ms
Bug:
18549150
Change-Id: I1d5b4fca627c22fdd8a32a41d5beac6837b6dff4
Andre Eisenbach [Tue, 2 Dec 2014 08:24:21 +0000 (08:24 +0000)]
am
d0f99244: am
e79be3d6: Add server-side callback for change in MTU (2/4)
* commit '
d0f99244a8fef1c25444ee3fd1bc2cd417a1b33e':
Add server-side callback for change in MTU (2/4)
Andre Eisenbach [Tue, 2 Dec 2014 08:14:17 +0000 (08:14 +0000)]
am
e79be3d6: Add server-side callback for change in MTU (2/4)
* commit '
e79be3d6ca41ed6349012c73a3374aca3714a053':
Add server-side callback for change in MTU (2/4)
Andre Eisenbach [Wed, 26 Nov 2014 20:56:55 +0000 (12:56 -0800)]
Add server-side callback for change in MTU (2/4)
When a client requests to update the LE transport MTU, the server
currently does not get notified and can therefor not properly size
notifications appropriate to the current MTU.
Bug:
18388114
Change-Id: Ice355f8919d4f69876574df1d90ce7d31f42bc4f
Wei Wang [Wed, 26 Nov 2014 20:47:49 +0000 (12:47 -0800)]
Remove unnecessary check of multiple advertise instance count.
Bug:
18539121
Change-Id: I841e4323ed4995bd9f8117681a759f52995d071f
Simon Wilson [Wed, 26 Nov 2014 19:57:34 +0000 (19:57 +0000)]
am
2bd9734e: am
2ffda316: am
254b5ba2: gki_buffer: add missing mutex unlock
* commit '
2bd9734ef17616d1352538047f2d71efa5692d65':
gki_buffer: add missing mutex unlock
Simon Wilson [Wed, 26 Nov 2014 18:41:47 +0000 (18:41 +0000)]
am
2ffda316: am
254b5ba2: gki_buffer: add missing mutex unlock
* commit '
2ffda316fc98f98eb7833006bd97a9e7686b6ba3':
gki_buffer: add missing mutex unlock
Zhenye Zhu [Tue, 25 Nov 2014 23:51:07 +0000 (15:51 -0800)]
PAN TAP fd is not monitored in all cases
Bug:
18271987
Change-Id: I348f3851a955b5277e7cdf0102583eaaef2ef0f3
Simon Wilson [Wed, 26 Nov 2014 00:59:38 +0000 (00:59 +0000)]
am
254b5ba2: gki_buffer: add missing mutex unlock
* commit '
254b5ba2e3f4c44b82a0369579b66bafcd0d6aa2':
gki_buffer: add missing mutex unlock
OSDN Git Service
