git.osdn.net Git - android-x86/system-bt.git/log

Scott James Remnant [Tue, 20 Oct 2015 23:15:56 +0000 (23:15 +0000)]

doc: add supported features document am: ac43e88a0a
am: 2be3cd3f69

* commit '2be3cd3f69513aac3a0a199c486f680dda6ad74a':
doc: add supported features document

commit | commitdiff | tree

Scott James Remnant [Tue, 20 Oct 2015 23:11:48 +0000 (23:11 +0000)]

doc: add supported features document
am: ac43e88a0a

* commit 'ac43e88a0aa375e712683e2b218d876c616e6f5e':
doc: add supported features document

commit | commitdiff | tree

Scott James Remnant [Tue, 20 Oct 2015 22:54:06 +0000 (15:54 -0700)]

doc: add supported features document

Summarize the versions and roles of each profile/protocol listed
in our Qualified Design, and provide a link to the QDID.

Change-Id: I8cfbbd466c684cb95de5433b3d7fa0f1fd567689

commit | commitdiff | tree

Sharvil Nanavati [Fri, 4 Sep 2015 09:06:45 +0000 (02:06 -0700)]

DO NOT MERGE Revert "am b3ca1b37: resolved conflicts for merge of a905eb62 to mnc-dr-dev-plus-aosp"

This reverts commit 2f86b2fc188edb0ba50483e624bd982a594c6633, reversing
changes made to 15c3ad9c08b864f63ed2581a10a65107fbe04752.

Change-Id: I43500eb0513180db8ba5b4ecc9f2dec934173c7f

commit | commitdiff | tree

Scott James Remnant [Tue, 20 Oct 2015 01:46:48 +0000 (18:46 -0700)]

DO NOT MERGE fix am error for 1dffda3b

Change-Id: Ic11a786ccf99ae50178b906f2163500c3af55612

commit | commitdiff | tree

Scott James Remnant [Mon, 19 Oct 2015 17:48:06 +0000 (10:48 -0700)]

DO NOT MERGE Revert "DO NOT MERGE Use POSIX timer API for wake alarms instead of OSI callouts."

Also reverts:
"Fix build: use unsigned long long in arithmetic expression."
"Fix build: add LOG_TAG parameter to LOG_* macros."

These CLs cause build failures on various platforms, an alternate
approach is being developed.

commit | commitdiff | tree

Scott James Remnant [Tue, 20 Oct 2015 20:27:17 +0000 (20:27 +0000)]

Merge "Fix use-after-free while setting advertisement data."

commit | commitdiff | tree

Sharvil Nanavati [Tue, 20 Oct 2015 20:23:46 +0000 (20:23 +0000)]

DO NOT MERGE Revert "am b3ca1b37: resolved conflicts for merge of a905eb62 to mnc-dr-dev-plus-aosp"
am: 41ddf544d0 -s ours

* commit '41ddf544d038e3ae0a26b6989bfb3d6727161e84':
DO NOT MERGE Revert "am b3ca1b37: resolved conflicts for merge of a905eb62 to mnc-dr-dev-plus-aosp"

commit | commitdiff | tree

Scott James Remnant [Tue, 20 Oct 2015 20:23:43 +0000 (20:23 +0000)]

DO NOT MERGE fix am error for 1dffda3b
am: f9e2fe4b33 -s ours

* commit 'f9e2fe4b3307c70cae1a06b0736d9483b284d4a3':
DO NOT MERGE fix am error for 1dffda3b

commit | commitdiff | tree

Scott James Remnant [Tue, 20 Oct 2015 20:23:41 +0000 (20:23 +0000)]

DO NOT MERGE Revert "DO NOT MERGE Use POSIX timer API for wake alarms instead of OSI callouts."
am: 43838819bc -s ours

* commit '43838819bc791d08cf087527e9ec4937bf516004':
DO NOT MERGE Revert "DO NOT MERGE Use POSIX timer API for wake alarms instead of OSI callouts."

commit | commitdiff | tree

Scott James Remnant [Tue, 20 Oct 2015 20:23:38 +0000 (20:23 +0000)]

Correct project name in Style Guide am: d20656568b
am: bbc4dc331a

* commit 'bbc4dc331acb7d8f828a8a3cae08ba3b6e073cef':
Correct project name in Style Guide

commit | commitdiff | tree

Scott James Remnant [Tue, 20 Oct 2015 20:23:35 +0000 (20:23 +0000)]

Resolve merge resolution differences between branches am: 02a29284a2 -s ours
am: 39db8130c6

* commit '39db8130c6cc109ada6f10f1f13fc92d419cb3b2':
Resolve merge resolution differences between branches

commit | commitdiff | tree

Andre Eisenbach [Tue, 20 Oct 2015 20:23:32 +0000 (20:23 +0000)]

am 36d0e2b9: Add Flic smart button to interop database
am: bb8196ad8e

* commit 'bb8196ad8e20ad21da8a95ede61d396393689e70':
Add Flic smart button to interop database

commit | commitdiff | tree

Pavlin Radoslavov [Tue, 20 Oct 2015 20:23:29 +0000 (20:23 +0000)]

am 1946f251: Add missing LOG_TAG as the first argument to LOG_ERROR()
am: c85cd70f66

* commit 'c85cd70f6661d5946efaa9920a22f674c6f65d36':
Add missing LOG_TAG as the first argument to LOG_ERROR()

commit | commitdiff | tree

Pavlin Radoslavov [Tue, 20 Oct 2015 20:23:26 +0000 (20:23 +0000)]

am 577862e0: Update the usage of fixed_queue.
am: 29d002b9b1

* commit '29d002b9b1ac73aac946eae1f6bf2cea8306b87b':
Update the usage of fixed_queue.

commit | commitdiff | tree

Scott James Remnant [Tue, 20 Oct 2015 20:23:22 +0000 (20:23 +0000)]

resolved conflicts for 5b9b1b89 to stage-aosp-master
am: d0c2dd9dc9

* commit 'd0c2dd9dc9081ef9a7a2750d5a87eae5abc011ab':
Raise BTU and HCI thread priorities

commit | commitdiff | tree

Pavlin Radoslavov [Tue, 20 Oct 2015 20:23:16 +0000 (20:23 +0000)]

am e29c3430: GKI cleanup - removed PORT_SCHEDULE_LOCK / UNLOCK macros
am: 2bca3d2a1f

* commit '2bca3d2a1f37d3469080b931735a117a8e6451c0':
GKI cleanup - removed PORT_SCHEDULE_LOCK / UNLOCK macros

commit | commitdiff | tree

Scott James Remnant [Tue, 20 Oct 2015 20:17:15 +0000 (13:17 -0700)]

resolve merge (with -s ours) of e40c734e67 to

Change-Id: Ib440572190d7ba08168545f0912f9583bbefa3c8

commit | commitdiff | tree

Pavlin Radoslavov [Tue, 20 Oct 2015 18:08:42 +0000 (18:08 +0000)]

am 91c7bdc6: am 9f1c9ad8: GKI cleanup - Moved struct TIMER_LIST_ENT to OSI
am: e3d732d27e -s ours

* commit 'e3d732d27ede9e99d0fd9c5347f296486c62cdb9':
GKI cleanup - Moved struct TIMER_LIST_ENT to OSI

commit | commitdiff | tree

Pavlin Radoslavov [Tue, 20 Oct 2015 17:54:39 +0000 (17:54 +0000)]

am ae5a6159: am 1a3844f9: GKI cleanup - Replaced usage of GKI queue with OSI fixed_queue
am: ad8c9cf44f -s ours

* commit 'ad8c9cf44fd160a3d4d7bdea58890f7a8ddf0f8d':
GKI cleanup - Replaced usage of GKI queue with OSI fixed_queue

commit | commitdiff | tree

Pavlin Radoslavov [Tue, 20 Oct 2015 17:22:23 +0000 (10:22 -0700)]

resolve merge conflicts of 2f1fd11c01 to master.

Change-Id: Ie4a92c10f123554af236b1a362363b558dbaa368

commit | commitdiff | tree

Sharvil Nanavati [Tue, 20 Oct 2015 02:22:48 +0000 (02:22 +0000)]

commit | commitdiff | tree

Scott James Remnant [Tue, 20 Oct 2015 02:22:44 +0000 (02:22 +0000)]

DO NOT MERGE fix am error for 1dffda3b
am: f9e2fe4b33 -s ours

* commit 'f9e2fe4b3307c70cae1a06b0736d9483b284d4a3':
DO NOT MERGE fix am error for 1dffda3b

commit | commitdiff | tree

Scott James Remnant [Tue, 20 Oct 2015 02:22:40 +0000 (02:22 +0000)]

commit | commitdiff | tree

Qiwen Zhao [Tue, 20 Oct 2015 02:16:44 +0000 (19:16 -0700)]

Merge commit 'e71c667e24e77144781835fcbaedddfc841e88c3'

commit | commitdiff | tree

Sharvil Nanavati [Fri, 4 Sep 2015 09:06:45 +0000 (02:06 -0700)]

commit | commitdiff | tree

Scott James Remnant [Tue, 20 Oct 2015 01:48:52 +0000 (01:48 +0000)]

Correct project name in Style Guide am: d20656568b
am: bbc4dc331a

* commit 'bbc4dc331acb7d8f828a8a3cae08ba3b6e073cef':
Correct project name in Style Guide

commit | commitdiff | tree

Scott James Remnant [Tue, 20 Oct 2015 01:48:43 +0000 (01:48 +0000)]

Resolve merge resolution differences between branches am: 02a29284a2 -s ours
am: 39db8130c6

* commit '39db8130c6cc109ada6f10f1f13fc92d419cb3b2':
Resolve merge resolution differences between branches

commit | commitdiff | tree

Scott James Remnant [Tue, 20 Oct 2015 01:46:48 +0000 (18:46 -0700)]

DO NOT MERGE fix am error for 1dffda3b

Change-Id: Ic11a786ccf99ae50178b906f2163500c3af55612

commit | commitdiff | tree

Scott James Remnant [Mon, 19 Oct 2015 17:48:06 +0000 (10:48 -0700)]

commit | commitdiff | tree

Scott James Remnant [Tue, 20 Oct 2015 01:30:36 +0000 (01:30 +0000)]

Correct project name in Style Guide
am: d20656568b

* commit 'd20656568beb2f3d1a6528771e6ac463ca92364c':
Correct project name in Style Guide

commit | commitdiff | tree

Scott James Remnant [Tue, 20 Oct 2015 01:30:28 +0000 (01:30 +0000)]

Resolve merge resolution differences between branches
am: 02a29284a2 -s ours

* commit '02a29284a26a9d63210865ae9f086c0ad730ca78':
Resolve merge resolution differences between branches

commit | commitdiff | tree

Scott James Remnant [Tue, 20 Oct 2015 01:02:03 +0000 (18:02 -0700)]

Correct project name in Style Guide

Change-Id: I07f41629b06820b85bf95ca255c68fc2ea78217a

commit | commitdiff | tree

Ian Coolidge [Thu, 21 May 2015 02:59:10 +0000 (19:59 -0700)]

Fix use-after-free while setting advertisement data.

Producer context was freeing data buffers without
performing a deep copy on the passed structure.

Also added some const correctness so we can reason
about the state of btif_adv_data_t as its data
gets associated with the advertising instance.

Bug: 21343750

Change-Id: Ifea0209e8426b61d8456c299c836ba640bd30f31

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 23:45:15 +0000 (23:45 +0000)]

am 51d14a76: am 89ba148d: Disable opening network debug ports for security reasons
am: cbdb081fde

* commit 'cbdb081fde3fe1231aa317c082e32248ff9f39cf':
Disable opening network debug ports for security reasons

commit | commitdiff | tree

Scott James Remnant [Mon, 19 Oct 2015 23:45:11 +0000 (23:45 +0000)]

am b4ccca65: resolved conflicts for 2181f1a4 to stage-aosp-master
am: 93d4e860be

* commit '93d4e860bee9059630cee1cc9355544cf4ebad65':
Fix PAN crash due to fd mismatch

commit | commitdiff | tree

Scott James Remnant [Mon, 19 Oct 2015 23:23:28 +0000 (16:23 -0700)]

Resolve merge resolution differences between branches

Change-Id: I7b2f5bcf3a43aacdfbb740589ca1538ade149473

commit | commitdiff | tree

Andre Eisenbach [Mon, 19 Oct 2015 23:06:20 +0000 (16:06 -0700)]

Remove absolute volume control whitelist

Remove the absolute volume control whitelist to enable absolute volume
control for all compatible devices.

Bug: 25081918
Change-Id: Iab0e4b4c4fd3dac0fefdf62ec80419dd64b56c0c

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 22:33:07 +0000 (15:33 -0700)]

resolved conflicts for 0b681505 to master

Change-Id: I342341e24e6cb06bbd6074aec30be0b40a3feeac

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 22:19:18 +0000 (15:19 -0700)]

resolved conflicts for 16424e5e to master

Change-Id: I33b2b627bf986c6d120acf8cf507d7884611a4ec

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 22:02:01 +0000 (15:02 -0700)]

resolved conflicts for edf3e911 to master

Change-Id: Ie7030e681a6a92246aa772198c8c1130b5f1786c

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 21:50:26 +0000 (21:50 +0000)]

am 36762636: (-s ours) am 41a842af: am 2e3d006b: GKI cleanup - Eliminate usage of pool buffers

* commit '367626369a1ba258f309ab052189e4f9c4bbe786':
GKI cleanup - Eliminate usage of pool buffers

commit | commitdiff | tree

Andre Eisenbach [Mon, 19 Oct 2015 21:12:04 +0000 (21:12 +0000)]

am bb8196ad: am 36d0e2b9: Add Flic smart button to interop database

* commit 'bb8196ad8e20ad21da8a95ede61d396393689e70':
Add Flic smart button to interop database

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 21:12:03 +0000 (21:12 +0000)]

am c85cd70f: am 1946f251: Add missing LOG_TAG as the first argument to LOG_ERROR()

* commit 'c85cd70f6661d5946efaa9920a22f674c6f65d36':
Add missing LOG_TAG as the first argument to LOG_ERROR()

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 21:12:03 +0000 (21:12 +0000)]

am 29d002b9: am 577862e0: Update the usage of fixed_queue.

* commit '29d002b9b1ac73aac946eae1f6bf2cea8306b87b':
Update the usage of fixed_queue.

commit | commitdiff | tree

Scott James Remnant [Mon, 19 Oct 2015 21:12:01 +0000 (21:12 +0000)]

am d0c2dd9d: resolved conflicts for 5b9b1b89 to stage-aosp-master

* commit 'd0c2dd9dc9081ef9a7a2750d5a87eae5abc011ab':
Raise BTU and HCI thread priorities

commit | commitdiff | tree

Andre Eisenbach [Mon, 19 Oct 2015 21:09:10 +0000 (14:09 -0700)]

am 36d0e2b9: Add Flic smart button to interop database

* commit '36d0e2b97be8b04d6607e9c1d76bbd2c9c891305':
Add Flic smart button to interop database

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 21:09:10 +0000 (14:09 -0700)]

am 1946f251: Add missing LOG_TAG as the first argument to LOG_ERROR()

* commit '1946f2516f5d1384ea7d25bb87d019c1875ae7f0':
Add missing LOG_TAG as the first argument to LOG_ERROR()

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 21:09:09 +0000 (14:09 -0700)]

am 577862e0: Update the usage of fixed_queue.

* commit '577862e0d87891164a469afcecd1135bf04d1f6e':
Update the usage of fixed_queue.

commit | commitdiff | tree

Scott James Remnant [Mon, 19 Oct 2015 21:05:46 +0000 (14:05 -0700)]

resolved conflicts for 5b9b1b89 to stage-aosp-master

Change-Id: I26781a825590a9effbc7d622391775b2eca58902

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 20:39:29 +0000 (20:39 +0000)]

am 2bca3d2a: am e29c3430: GKI cleanup - removed PORT_SCHEDULE_LOCK / UNLOCK macros

* commit '2bca3d2a1f37d3469080b931735a117a8e6451c0':
GKI cleanup - removed PORT_SCHEDULE_LOCK / UNLOCK macros

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 20:39:28 +0000 (20:39 +0000)]

am e40c734e: am 258c2538: GKI cleanup - moved GKI buffer allocation wrappers to OSI

* commit 'e40c734e67a59a7cd750a33a2d077ac6911768b0':
GKI cleanup - moved GKI buffer allocation wrappers to OSI

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 20:39:26 +0000 (20:39 +0000)]

am 91c7bdc6: am 9f1c9ad8: GKI cleanup - Moved struct TIMER_LIST_ENT to OSI

* commit '91c7bdc622251b0feb69b5f78d614a0180e4aa2c':
GKI cleanup - Moved struct TIMER_LIST_ENT to OSI

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 20:39:25 +0000 (20:39 +0000)]

am ae5a6159: am 1a3844f9: GKI cleanup - Replaced usage of GKI queue with OSI fixed_queue

* commit 'ae5a6159b675b5d01ce3731a292ba0ea9f3c8291':
GKI cleanup - Replaced usage of GKI queue with OSI fixed_queue

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 20:39:23 +0000 (20:39 +0000)]

am 5de9c923: am 1eb1ea0c: GKI cleanup - Moved functions GKI_disable() and GKI_enable() to OSI

* commit '5de9c923d39c9fc9991620d7bd1572c38466d6ad':
GKI cleanup - Moved functions GKI_disable() and GKI_enable() to OSI

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 20:34:58 +0000 (20:34 +0000)]

am b22aeb23: resolved conflicts for c196f214 to stage-aosp-master

* commit 'b22aeb23fa102920199f2a537e6628bc8c3781eb':
GKI cleanup - Moved GKI_get_os_tick_count() to OSI

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 20:33:18 +0000 (13:33 -0700)]

am e29c3430: GKI cleanup - removed PORT_SCHEDULE_LOCK / UNLOCK macros

* commit 'e29c3430bfee2d92ba09c3cb4780a577ffc90712':
GKI cleanup - removed PORT_SCHEDULE_LOCK / UNLOCK macros

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 20:33:17 +0000 (13:33 -0700)]

am 258c2538: GKI cleanup - moved GKI buffer allocation wrappers to OSI

* commit '258c2538e3b62a8cdb403f2730c45d721e5292b4':
GKI cleanup - moved GKI buffer allocation wrappers to OSI

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 20:33:17 +0000 (13:33 -0700)]

am 9f1c9ad8: GKI cleanup - Moved struct TIMER_LIST_ENT to OSI

* commit '9f1c9ad85759c7663e3bbc494f8e75b2f107da67':
GKI cleanup - Moved struct TIMER_LIST_ENT to OSI

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 20:33:16 +0000 (13:33 -0700)]

am 1a3844f9: GKI cleanup - Replaced usage of GKI queue with OSI fixed_queue

* commit '1a3844f933bd63c8a381371dabfb35c6a0249e3e':
GKI cleanup - Replaced usage of GKI queue with OSI fixed_queue

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 20:33:15 +0000 (13:33 -0700)]

am 1eb1ea0c: GKI cleanup - Moved functions GKI_disable() and GKI_enable() to OSI

* commit '1eb1ea0cf2da992a3193506806e571dcbe3ec947':
GKI cleanup - Moved functions GKI_disable() and GKI_enable() to OSI

commit | commitdiff | tree

tturney [Mon, 19 Oct 2015 20:28:23 +0000 (20:28 +0000)]

am 3445b4a7: am 3d3810fe: am 6b24485c: Fix PAN and AV role switch war

* commit '3445b4a706a9e8a5b3ff130953385afc4ef2b636':
Fix PAN and AV role switch war

commit | commitdiff | tree

Andre Eisenbach [Mon, 19 Oct 2015 20:28:23 +0000 (20:28 +0000)]

am 12abc3cb: am 3f236aa1: am 410970f2: Ensure thread priority is raised for media task / UIPC

* commit '12abc3cbe61c3b4bb03b7319056abccf56d71565':
Ensure thread priority is raised for media task / UIPC

commit | commitdiff | tree

Andre Eisenbach [Mon, 19 Oct 2015 20:28:22 +0000 (20:28 +0000)]

am 4f1f20f4: am 1535b55c: am 8c24123f: Change UHID socket to be non-blocking

* commit '4f1f20f46825f365671afe52f39f741b05747860':
Change UHID socket to be non-blocking

commit | commitdiff | tree

Nitin Shivpure [Mon, 19 Oct 2015 20:28:22 +0000 (20:28 +0000)]

am 662545ac: am 2ae635f4: am 7f2eed69: Check BR device count before initiating role switch

* commit '662545ac2c86efc0d3504de47bc51b09ee648cd7':
Check BR device count before initiating role switch

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 20:24:32 +0000 (13:24 -0700)]

resolved conflicts for c196f214 to stage-aosp-master

Change-Id: I3c8acd59271180d5c11760d08ea960bb90040a8e

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 20:09:47 +0000 (13:09 -0700)]

resolved conflicts for a7a277cf to master

Change-Id: I63d0a0742a5476f5b951f10956b726810882565c

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 20:00:33 +0000 (20:00 +0000)]

am 51d14a76: am 89ba148d: Disable opening network debug ports for security reasons

* commit '51d14a7610d4802f5d007f4513b32f957b1e28ec':
Disable opening network debug ports for security reasons

commit | commitdiff | tree

Scott James Remnant [Mon, 19 Oct 2015 19:56:32 +0000 (19:56 +0000)]

am b4ccca65: resolved conflicts for 2181f1a4 to stage-aosp-master

* commit 'b4ccca65781e92ef9096834db8537309917b9cea':
Fix PAN crash due to fd mismatch

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 19:55:07 +0000 (12:55 -0700)]

am 89ba148d: Disable opening network debug ports for security reasons

* commit '89ba148d2e19e6633318dd2d9a04bd2728281c30':
Disable opening network debug ports for security reasons

commit | commitdiff | tree

Sharvil Nanavati [Mon, 19 Oct 2015 19:55:07 +0000 (19:55 +0000)]

am 3880a381: am 16c682a7: am de86bfa2: Add libpower as a dependency to all device targets that include libosi.

* commit '3880a3812bdc148018f5adfaf41720e6d322e0d1':
Add libpower as a dependency to all device targets that include libosi.

commit | commitdiff | tree

tturney [Mon, 19 Oct 2015 19:55:07 +0000 (19:55 +0000)]

am 152dda92: am e1beca8b: am 20a1555a: Allow BT inquiry while discovery is in progress.

* commit '152dda920ceaff4a7331ae3decd1e97920b43da2':
Allow BT inquiry while discovery is in progress.

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 19:55:06 +0000 (19:55 +0000)]

am 800f0bd2: am 78f84da0: am 7b4fdb40: Eliminate recursive calling when handling GATT related errors

* commit '800f0bd29515504b773b776c277ce74dd68aabc3':
Eliminate recursive calling when handling GATT related errors

commit | commitdiff | tree

wang ping [Mon, 19 Oct 2015 19:55:05 +0000 (19:55 +0000)]

am 76d13f8d: am de5a6f38: am aafe557b: Fix issue where bluesleep idle timer is not started

* commit '76d13f8d8c9233e96b965724993704773e65f823':
Fix issue where bluesleep idle timer is not started

commit | commitdiff | tree

tturney [Mon, 19 Oct 2015 19:55:05 +0000 (19:55 +0000)]

am cb7e8f9b: am 4d99e011: am 530f7727: Fix btwrite timer timeout for Angler (2/2)

* commit 'cb7e8f9bbe62f11088f9e5b90b1b470fa3ca52b8':
Fix btwrite timer timeout for Angler (2/2)

commit | commitdiff | tree

Joshua Schwarz [Mon, 19 Oct 2015 19:55:04 +0000 (19:55 +0000)]

am e9ab8a36: am 8bad5d06: am 9d0965c9: Implementation of net_test_bluedroid as a GTest.

* commit 'e9ab8a36d222b135bb51cd8a49c3a6b71269b106':
Implementation of net_test_bluedroid as a GTest.

commit | commitdiff | tree

Jacob Lee [Mon, 19 Oct 2015 19:55:03 +0000 (19:55 +0000)]

am 9b8f7c62: am cc504635: am fda32d91: LE Multi-Advertising State Change Sub-event Wrong Variable Type

* commit '9b8f7c62c428bb60fce38c6ec3177923a2fa1a13':
LE Multi-Advertising State Change Sub-event Wrong Variable Type

commit | commitdiff | tree

Sunny Kapdi [Mon, 19 Oct 2015 19:55:02 +0000 (19:55 +0000)]

am 1d5fe5c4: am 958f09b6: am 4602429d: Fix incorrect SetConnScanParam function mapping

* commit '1d5fe5c41e57f70727735f0e94dfd17d780c6bb4':
Fix incorrect SetConnScanParam function mapping

commit | commitdiff | tree

Chih-Hung Hsieh [Mon, 19 Oct 2015 19:55:01 +0000 (19:55 +0000)]

am 1948336c: am a887e765: am 11026214: Enable clang compilation.

* commit '1948336c4025489b61f725f0357ab71a79a22da7':
Enable clang compilation.

commit | commitdiff | tree

Sharvil Nanavati [Mon, 19 Oct 2015 19:55:00 +0000 (19:55 +0000)]

am c8eb3f77: am 7deacad6: am 3858011b: Send current RPA instead of pseudo-address on connect.

* commit 'c8eb3f77e15017187685180cdbca51697b1da54f':
Send current RPA instead of pseudo-address on connect.

commit | commitdiff | tree

Eric Laurent [Mon, 19 Oct 2015 19:54:59 +0000 (19:54 +0000)]

am a4d32b59: am 6106a1b3: am f34d336a: (-s ours) A2DP audio HAL: implement out_get_presentation_position()

* commit 'a4d32b59192b985a13a2f3fada0cf79a2b1ba1d1':
A2DP audio HAL: implement out_get_presentation_position()

commit | commitdiff | tree

Ajay Panicker [Mon, 19 Oct 2015 19:54:58 +0000 (19:54 +0000)]

am 5e20685e: am 22c1d4fe: am 28f294b9: Load factory Bluetooth address from system property

* commit '5e20685e4dae1cefa0a6ad05be9f3c0e0e41f192':
Load factory Bluetooth address from system property

commit | commitdiff | tree

Sharvil Nanavati [Mon, 19 Oct 2015 19:54:57 +0000 (19:54 +0000)]

am 97018a4c: am 09e9dec4: am 6a42cbdb: Add a SCO routing command to net_hci.

* commit '97018a4ccd797c8ada1ebc8cdf85cc4da0d634ca':
Add a SCO routing command to net_hci.

commit | commitdiff | tree

Andre Eisenbach [Mon, 19 Oct 2015 19:54:56 +0000 (19:54 +0000)]

am e37a7807: am 7fbf06c2: am 2af0bb6e: Fix merge discrepencies and resulting compile errors

* commit 'e37a780798cf0179f10b7baec1f48114944b7749':
Fix merge discrepencies and resulting compile errors

commit | commitdiff | tree

Scott James Remnant [Mon, 19 Oct 2015 19:21:22 +0000 (12:21 -0700)]

resolved conflicts for 2181f1a4 to stage-aosp-master

Change-Id: Ie6dd56d2605e732f9f9e08269d361288bb888874

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 19:14:13 +0000 (19:14 +0000)]

am e0f21ad7: am 70ae7de9: GKI cleanup - Remove GKI pool related defines

* commit 'e0f21ad7a8b6ff18babe774d9e047f8f13d2f11d':
GKI cleanup - Remove GKI pool related defines

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 19:14:13 +0000 (19:14 +0000)]

am a0bec1cc: am 1d5b8592: GKI cleanup - Eliminate function GKI_get_pool_bufsize()

* commit 'a0bec1cc845eee860682373eb5128a9a7bfb5fff':
GKI cleanup - Eliminate function GKI_get_pool_bufsize()

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 19:14:12 +0000 (19:14 +0000)]

am 322cb6e7: am 21cce2ec: GKI cleanup - Eliminated function GKI_poolcount

* commit '322cb6e75bbbcd8f89717bd7f21166550dd72df5':
GKI cleanup - Eliminated function GKI_poolcount

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 19:14:12 +0000 (19:14 +0000)]

am 41a842af: am 2e3d006b: GKI cleanup - Eliminate usage of pool buffers

* commit '41a842af4974a51f574872f2497794da7416d0dd':
GKI cleanup - Eliminate usage of pool buffers

commit | commitdiff | tree

tturney [Mon, 19 Oct 2015 19:14:11 +0000 (19:14 +0000)]

am 3d3810fe: am 6b24485c: Fix PAN and AV role switch war

* commit '3d3810feeea3e6518fe9de173695e34d645db4ee':
Fix PAN and AV role switch war

commit | commitdiff | tree

Andre Eisenbach [Mon, 19 Oct 2015 19:14:11 +0000 (19:14 +0000)]

am 3f236aa1: am 410970f2: Ensure thread priority is raised for media task / UIPC

* commit '3f236aa1a63a63f47ea0fcead037292ab59116bb':
Ensure thread priority is raised for media task / UIPC

commit | commitdiff | tree

Andre Eisenbach [Mon, 19 Oct 2015 19:14:10 +0000 (19:14 +0000)]

am 1535b55c: am 8c24123f: Change UHID socket to be non-blocking

* commit '1535b55c2f9691c0fda6e22de9367145b99bc03f':
Change UHID socket to be non-blocking

commit | commitdiff | tree

Nitin Shivpure [Mon, 19 Oct 2015 19:14:10 +0000 (19:14 +0000)]

am 2ae635f4: am 7f2eed69: Check BR device count before initiating role switch

* commit '2ae635f40a0f942b0b876176dd5d83ea35070338':
Check BR device count before initiating role switch

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 19:14:09 +0000 (19:14 +0000)]

am 4eaa995e: am 642f2330: GKI cleanup - Eliminated function GKI_delay

* commit '4eaa995e5a596c862c46e41c07e5203b3dbd6f8c':
GKI cleanup - Eliminated function GKI_delay

commit | commitdiff | tree

Sharvil Nanavati [Mon, 19 Oct 2015 19:14:08 +0000 (19:14 +0000)]

am 16c682a7: am de86bfa2: Add libpower as a dependency to all device targets that include libosi.

* commit '16c682a7e8295843d2c905a4aea1096bdca522f8':
Add libpower as a dependency to all device targets that include libosi.

commit | commitdiff | tree

tturney [Mon, 19 Oct 2015 19:14:08 +0000 (19:14 +0000)]

am e1beca8b: am 20a1555a: Allow BT inquiry while discovery is in progress.

* commit 'e1beca8bbcfcfba2bf6ab46627a439ff95cdb0fa':
Allow BT inquiry while discovery is in progress.

commit | commitdiff | tree

Pavlin Radoslavov [Mon, 19 Oct 2015 19:14:07 +0000 (19:14 +0000)]

am 78f84da0: am 7b4fdb40: Eliminate recursive calling when handling GATT related errors

* commit '78f84da065c336941a80895756614ff87d3b481f':
Eliminate recursive calling when handling GATT related errors

commit | commitdiff | tree

wang ping [Mon, 19 Oct 2015 19:14:06 +0000 (19:14 +0000)]

am de5a6f38: am aafe557b: Fix issue where bluesleep idle timer is not started

* commit 'de5a6f387eb366f605e9d759148f40862c9bca1a':
Fix issue where bluesleep idle timer is not started

commit | commitdiff | tree

tturney [Mon, 19 Oct 2015 19:14:06 +0000 (19:14 +0000)]

am 4d99e011: am 530f7727: Fix btwrite timer timeout for Angler (2/2)

* commit '4d99e011dcc7b0bef88bb24d7d7b5e51897bfaa5':
Fix btwrite timer timeout for Angler (2/2)

commit | commitdiff | tree

Joshua Schwarz [Mon, 19 Oct 2015 19:14:05 +0000 (19:14 +0000)]

am 8bad5d06: am 9d0965c9: Implementation of net_test_bluedroid as a GTest.

* commit '8bad5d06de9792e19bb698c049c7bfa347520cba':
Implementation of net_test_bluedroid as a GTest.