OSDN Git Service
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
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
Scott James Remnant [Mon, 19 Oct 2015 23:23:28 +0000 (16:23 -0700)]
Resolve merge resolution differences between branches
Change-Id: I7b2f5bcf3a43aacdfbb740589ca1538ade149473
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
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()
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.
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
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
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()
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.
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
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
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
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
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
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
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
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
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
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
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
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
Pavlin Radoslavov [Mon, 19 Oct 2015 20:24:32 +0000 (13:24 -0700)]
resolved conflicts for
c196f214 to stage-aosp-master
Change-Id: I3c8acd59271180d5c11760d08ea960bb90040a8e
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
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
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
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
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
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()
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
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
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
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
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
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
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
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.
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.
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
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
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)
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.
Jacob Lee [Mon, 19 Oct 2015 19:14:05 +0000 (19:14 +0000)]
am
cc504635: am
fda32d91: LE Multi-Advertising State Change Sub-event Wrong Variable Type
* commit '
cc5046351361c5684f97cbb1032f5d514581592e':
LE Multi-Advertising State Change Sub-event Wrong Variable Type
Sunny Kapdi [Mon, 19 Oct 2015 19:14:04 +0000 (19:14 +0000)]
am
958f09b6: am
4602429d: Fix incorrect SetConnScanParam function mapping
* commit '
958f09b6a0e8af5ef9e26f3cb6eec5117f5e8b4d':
Fix incorrect SetConnScanParam function mapping
Chih-Hung Hsieh [Mon, 19 Oct 2015 19:14:03 +0000 (19:14 +0000)]
am
a887e765: am
11026214: Enable clang compilation.
* commit '
a887e765da53bb49b7cb834e930cd793732dbcc9':
Enable clang compilation.
Sharvil Nanavati [Mon, 19 Oct 2015 19:14:03 +0000 (19:14 +0000)]
am
7deacad6: am
3858011b: Send current RPA instead of pseudo-address on connect.
* commit '
7deacad6f54e08296527769b514183532d6fda29':
Send current RPA instead of pseudo-address on connect.
Eric Laurent [Mon, 19 Oct 2015 19:14:02 +0000 (19:14 +0000)]
am
6106a1b3: am
f34d336a: (-s ours) A2DP audio HAL: implement out_get_presentation_position()
* commit '
6106a1b3217ff15a62498e706812a0a548a72261':
A2DP audio HAL: implement out_get_presentation_position()
Pavlin Radoslavov [Mon, 19 Oct 2015 19:10:39 +0000 (12:10 -0700)]
am
70ae7de9: GKI cleanup - Remove GKI pool related defines
* commit '
70ae7de9451e3dc074a048ba98b672a6ba3a4551':
GKI cleanup - Remove GKI pool related defines
Pavlin Radoslavov [Mon, 19 Oct 2015 19:10:38 +0000 (12:10 -0700)]
am
1d5b8592: GKI cleanup - Eliminate function GKI_get_pool_bufsize()
* commit '
1d5b85924df3a114efe6588e857d0de3eb47b1d2':
GKI cleanup - Eliminate function GKI_get_pool_bufsize()
Pavlin Radoslavov [Mon, 19 Oct 2015 19:10:38 +0000 (12:10 -0700)]
am
21cce2ec: GKI cleanup - Eliminated function GKI_poolcount
* commit '
21cce2ecb75265845e7b24f2cde11e104b074838':
GKI cleanup - Eliminated function GKI_poolcount
Pavlin Radoslavov [Mon, 19 Oct 2015 19:10:37 +0000 (12:10 -0700)]
am
2e3d006b: GKI cleanup - Eliminate usage of pool buffers
* commit '
2e3d006b96eafb0651fe7f78d28250faf89405de':
GKI cleanup - Eliminate usage of pool buffers
tturney [Mon, 19 Oct 2015 19:10:37 +0000 (12:10 -0700)]
am
6b24485c: Fix PAN and AV role switch war
* commit '
6b24485cec18ea111b05bc23f61d9c3f6a6b8747':
Fix PAN and AV role switch war
Andre Eisenbach [Mon, 19 Oct 2015 19:10:37 +0000 (12:10 -0700)]
am
410970f2: Ensure thread priority is raised for media task / UIPC
* commit '
410970f285ff34e6f1952dec2202825d890c3a0d':
Ensure thread priority is raised for media task / UIPC
Andre Eisenbach [Mon, 19 Oct 2015 19:10:36 +0000 (12:10 -0700)]
am
8c24123f: Change UHID socket to be non-blocking
* commit '
8c24123f9897991d228865c7eec35e33569e46bb':
Change UHID socket to be non-blocking
Nitin Shivpure [Mon, 19 Oct 2015 19:10:36 +0000 (12:10 -0700)]
am
7f2eed69: Check BR device count before initiating role switch
* commit '
7f2eed693f328843ed912144ed6ffcab0f2e3e75':
Check BR device count before initiating role switch
Pavlin Radoslavov [Mon, 19 Oct 2015 19:10:35 +0000 (12:10 -0700)]
am
642f2330: GKI cleanup - Eliminated function GKI_delay
* commit '
642f233005cdcbbbcb92b77d6297fc080b7f072e':
GKI cleanup - Eliminated function GKI_delay
Sharvil Nanavati [Mon, 19 Oct 2015 19:10:35 +0000 (12:10 -0700)]
am
de86bfa2: Add libpower as a dependency to all device targets that include libosi.
* commit '
de86bfa27b3ae6a9812788efe2b76fa3e7931d56':
Add libpower as a dependency to all device targets that include libosi.
tturney [Mon, 19 Oct 2015 19:10:34 +0000 (12:10 -0700)]
am
20a1555a: Allow BT inquiry while discovery is in progress.
* commit '
20a1555a0665efaab69ff25b3e7842d5f6c110c8':
Allow BT inquiry while discovery is in progress.
Pavlin Radoslavov [Mon, 19 Oct 2015 19:10:34 +0000 (12:10 -0700)]
am
7b4fdb40: Eliminate recursive calling when handling GATT related errors
* commit '
7b4fdb40e81a68d254f6bf7cefbc385d978fb9d0':
Eliminate recursive calling when handling GATT related errors
wang ping [Mon, 19 Oct 2015 19:10:33 +0000 (12:10 -0700)]
am
aafe557b: Fix issue where bluesleep idle timer is not started
* commit '
aafe557b56f2fb97a9d96a86bef8b4d6886cc6b3':
Fix issue where bluesleep idle timer is not started
tturney [Mon, 19 Oct 2015 19:10:33 +0000 (12:10 -0700)]
am
530f7727: Fix btwrite timer timeout for Angler (2/2)
* commit '
530f7727badf163705eb9638533f5af5d89fcacf':
Fix btwrite timer timeout for Angler (2/2)
Joshua Schwarz [Mon, 19 Oct 2015 19:10:32 +0000 (12:10 -0700)]
am
9d0965c9: Implementation of net_test_bluedroid as a GTest.
* commit '
9d0965c9c9aaeac3dbb3b1ba5f76b3d9010f3eaa':
Implementation of net_test_bluedroid as a GTest.
Jacob Lee [Mon, 19 Oct 2015 19:10:32 +0000 (12:10 -0700)]
am
fda32d91: LE Multi-Advertising State Change Sub-event Wrong Variable Type
* commit '
fda32d91ec7f5a2e04464d19a6e57cddbe81c2e7':
LE Multi-Advertising State Change Sub-event Wrong Variable Type
Sunny Kapdi [Mon, 19 Oct 2015 19:10:31 +0000 (12:10 -0700)]
am
4602429d: Fix incorrect SetConnScanParam function mapping
* commit '
4602429dbcf5a5d6076f65450354be4db9f0f114':
Fix incorrect SetConnScanParam function mapping
Chih-Hung Hsieh [Mon, 19 Oct 2015 19:10:31 +0000 (12:10 -0700)]
am
11026214: Enable clang compilation.
* commit '
110262140c4ab383a27d19c08e33f5937bd09c11':
Enable clang compilation.
Sharvil Nanavati [Mon, 19 Oct 2015 19:10:31 +0000 (12:10 -0700)]
am
3858011b: Send current RPA instead of pseudo-address on connect.
* commit '
3858011befbf62ac8c38af1493d9c61d43f999da':
Send current RPA instead of pseudo-address on connect.
Eric Laurent [Mon, 19 Oct 2015 19:10:30 +0000 (12:10 -0700)]
am
f34d336a: (-s ours) A2DP audio HAL: implement out_get_presentation_position()
* commit '
f34d336a16a6788f667355b70a4d53b1325a25ed':
A2DP audio HAL: implement out_get_presentation_position()
Ajay Panicker [Mon, 19 Oct 2015 19:09:47 +0000 (19:09 +0000)]
am
22c1d4fe: am
28f294b9: Load factory Bluetooth address from system property
* commit '
22c1d4fe04bea076b793d370cd8fe9ab00660eb5':
Load factory Bluetooth address from system property
Sharvil Nanavati [Mon, 19 Oct 2015 19:09:46 +0000 (19:09 +0000)]
am
09e9dec4: am
6a42cbdb: Add a SCO routing command to net_hci.
* commit '
09e9dec4a8011803ba3343ad0eeb347583b41c11':
Add a SCO routing command to net_hci.
Andre Eisenbach [Mon, 19 Oct 2015 19:09:45 +0000 (19:09 +0000)]
am
7fbf06c2: am
2af0bb6e: Fix merge discrepencies and resulting compile errors
* commit '
7fbf06c2ba7a57d38e567c36941d5aca8c906b71':
Fix merge discrepencies and resulting compile errors
Ajay Panicker [Mon, 19 Oct 2015 19:03:02 +0000 (12:03 -0700)]
am
28f294b9: Load factory Bluetooth address from system property
* commit '
28f294b94f6e05f4572672671535f66bb60f0c0a':
Load factory Bluetooth address from system property
Sharvil Nanavati [Mon, 19 Oct 2015 19:03:02 +0000 (12:03 -0700)]
am
6a42cbdb: Add a SCO routing command to net_hci.
* commit '
6a42cbdb53d856a364a0c0fac28a732b55bc1cd9':
Add a SCO routing command to net_hci.
Andre Eisenbach [Mon, 19 Oct 2015 19:03:01 +0000 (12:03 -0700)]
am
2af0bb6e: Fix merge discrepencies and resulting compile errors
* commit '
2af0bb6e5f6b380f374d510c54eabdf74c32bdf2':
Fix merge discrepencies and resulting compile errors
Andre Eisenbach [Mon, 5 Oct 2015 20:25:14 +0000 (13:25 -0700)]
Add Flic smart button to interop database
Bug:
24737963
Change-Id: If3b59437439305b490c5fc260a7080cee04f09c5
Pavlin Radoslavov [Thu, 8 Oct 2015 16:52:11 +0000 (09:52 -0700)]
Add missing LOG_TAG as the first argument to LOG_ERROR()
NOTE: This fix is needed as a side-effect of code merged
from different branches.
Change-Id: I1d25e719605d75899253732bd3d10ca0b552d244
Pavlin Radoslavov [Thu, 8 Oct 2015 01:07:48 +0000 (18:07 -0700)]
Update the usage of fixed_queue.
* Relax non-NULL requirements for fixed_queue by eliminating
some of the asserts.
Now, when semantically possible, fixed_queue - related function
will return the appropriate value even if the queue pointer is NULL.
This reduces clutter in the code where we had to do anyway
"if (queue != NULL)" checks.
* Add non-NULL guards in the few remaining places where
fixed_queue_get_list(). For now, we need to use this function,
hence the extra check.
That function should be eliminated in the future, because all the
code where it is used violates the semantics of using a queue.
Bug:
24723840
Change-Id: I47632a3515f3d27856d4870e18723d345c040d64
Andre Eisenbach [Wed, 7 Oct 2015 18:16:37 +0000 (11:16 -0700)]
Raise BTU and HCI thread priorities
The audio sub-system and audio related tasks run at elevated thread
priorities in order to ensure timely handling of audio packets. This
patch raises the thread priority of lower layer Bluetooth tasks involved
in delivering audio packets to avoid thread pre-emption and subsequent
audio skipping.
Bug:
24570959
Change-Id: I5e19ee4590207df753f7b8bfc22174959722ec2d
Pavlin Radoslavov [Mon, 28 Sep 2015 06:27:10 +0000 (23:27 -0700)]
GKI cleanup - removed PORT_SCHEDULE_LOCK / UNLOCK macros
Removed macros PORT_SCHEDULE_LOCK and PORT_SCHEDULE_UNLOCK
and replaced them with direct calls to mutex_global_lock()
and mutex_global_unlock() respectively.
Change-Id: I84a365feec239612b2224f029ae59f260cdb24a4
Pavlin Radoslavov [Mon, 28 Sep 2015 03:59:05 +0000 (20:59 -0700)]
GKI cleanup - moved GKI buffer allocation wrappers to OSI
* Moved the following GKI buffer allocation functions to OSI:
- GKI_getbuf() -> osi_getbuf()
- GKI_freebuf() -> osi_freebuf()
- GKI_get_buf_size() -> osi_get_buf_size()
For now we need the osi_getbuf() / osi_freebuf() allocation wrapper,
because we need to be able to call osi_get_buf_size() on the allocated
buffer.
In the future those should be replaced with osi_malloc() / osi_free().
Currently, the osi_malloc() buffer size internal allocation tracker
does not always track the size, hence we need the osi_getbuf() wrapper.
* Replaced GKI_MAX_BUF_SIZE with BT_DEFAULT_BUFFER_SIZE
* Added new file include/bt_common.h that can be usee to include
few files that should be included alost everywhere (e.g. bt_target.h"
NOTE: This file might be removed in the future and we should include
everywhere the right set of header files.
* Removed some of the GKI-related references
* Removed file include/gki_target.h
Change-Id: Ie87830e73143de200746d54235aa99f228a95024
Pavlin Radoslavov [Mon, 28 Sep 2015 02:39:37 +0000 (19:39 -0700)]
GKI cleanup - Moved struct TIMER_LIST_ENT to OSI
* Moved struct TIMER_LIST_ENT to file osi/include/non_repeating_timer.h
and renamed it to timer_entry_t
NOTE: This is a short-term solution. timer_entry_t should be
removed, and its usage everywhere should be replaced by
struct non_repeating_timer_t .
* Renamed TIMER_CBACK to timer_callback_t
* Renamed TIMER_PARAM_TYPE to timer_param_t
Change-Id: I9ca830718bf900195f9c0a513a97f6995322693b
Pavlin Radoslavov [Fri, 25 Sep 2015 18:21:15 +0000 (11:21 -0700)]
GKI cleanup - Replaced usage of GKI queue with OSI fixed_queue
* Added new functions to OSI:
- fixed_queue_init()
- fixed_queue_length()
- fixed_queue_try_remove_from_queue()
- fixed_queue_try_peek_last()
* Renamed fixed_queue_try_peek() to fixed_queue_try_peek_first()
* Replaced usage of GKI queue functions with OSI fixed_queue functions:
- GKI_init_q() -> fixed_queue_new(SIZE_MAX)
NOTE: unlike GKI_init_q(), fixed_queue_new() allocates memory /
state that needs to be released by calling fixed_queue_free()
- GKI_enqueue() -> fixed_queue_enqueue()
- GKI_dequeue() -> fixed_queue_try_dequeue()
NOTE: fixed_queue_try_dequeue() is non-blocking
- GKI_queue_length() -> fixed_queue_length()
- GKI_queue_is_empty() -> fixed_queue_is_empty()
- GKI_getfirst() -> fixed_queue_try_peek_first()
- GKI_getlast() -> fixed_queue_try_peek_last()
- GKI_remove_from_queue() -> fixed_queue_try_remove_from_queue()
- Queue elements iteration.
In the fixed_queue implementation we have to use the underlying
list_t mechanism to iterate over the elements.
OLD:
p = GKI_getfirst(queue);
...
while ((p = GKI_getnext(p) != NULL) {
...
}
NEW:
list_t *list = fixed_queue_get_list(queue);
for (const list_node_t *node = list_begin(list);
node != list_end(list); node = list_next(node)) {
p = list_node(node);
}
* Remove initialization of the GKI module, because it is not needed
anymore
* Removed unused files in GKI:
gki/common/gki_common.h
gki/ulinux/gki_int.h
gki/ulinux/gki_ulinux.c
Change-Id: I3ff9464db75252d6faf7476a9ca67c88e535c51c
Pavlin Radoslavov [Fri, 25 Sep 2015 05:07:53 +0000 (22:07 -0700)]
GKI cleanup - Moved functions GKI_disable() and GKI_enable() to OSI
Added new functions mutex_global_lock() and mutex_global_unlock()
within the OSI module, and replaced GKI_disable() and GKI_enable()
with those functions.
Also, minor cleanup in the gki.h header file.
Change-Id: I5f410e3174541224fcf30f37e1524ef099c25193
Pavlin Radoslavov [Thu, 24 Sep 2015 03:39:53 +0000 (20:39 -0700)]
GKI cleanup - Moved GKI_get_os_tick_count() to OSI
* Renamed function GKI_get_os_tick_count() to time_get_os_boottime_ms()
and moved it to the OSI module: to the new file osi/src/time.c .
The corresponding header file is osi/include/time.h
* Added unit tests for function time_get_os_boottime_ms() in file
osi/test/time_test.cpp
* Removed "osi/include" from the list of paths to search for include
files. This is needed, because file name collision of "time.h"
in osi/include and the system <time.h>
Change-Id: I934be0c8f392150a352947326546bcf8aa070f97
Pavlin Radoslavov [Thu, 24 Sep 2015 20:34:35 +0000 (13:34 -0700)]
Disable opening network debug ports for security reasons
By default, we open up to three TCP ports that are used
for debugging purpose:
* TCP port 8872 - used for forwarding btsnoop logs at real time
Note: the port is open only if "Bluetooth HCI snoop log" is enabled
in the Developer options
* TCP port 8873 - used for HCI debugging
* TCP port 8879 - used for debugging the Bluetooth counters
Those ports are disabled by default.
To enable, the following #define should be added at the top of the
corresponding file(s): btcore/src/counter.c hci/src/btsnoop_net.c
hci/src/hci_inject.c
#define BT_NET_DEBUG TRUE
Bug:
24371736
Change-Id: I5cb43af1a5d29c331eb5ef61a24dccbe95df6f40
Nitin Shivpure [Sun, 6 Sep 2015 09:34:01 +0000 (15:04 +0530)]
Fix PAN crash due to fd mismatch
A case, where tap read thread is always exist, Sometimes
data packets get recieved on older fd, which is not available.
which is causing assert due to fd mismatch in race condition.
when next pan connection is immediately available. If last pan
connection gets disconnected, then tap_read_thread should be
destroyed in btif context to fix this issue.
Bug:
24093456
Change-Id: Ic1053200a7be4c2091d6c394634831ca3fbd61df
Pavlin Radoslavov [Wed, 23 Sep 2015 21:49:24 +0000 (14:49 -0700)]
GKI cleanup - Remove GKI pool related defines
* Removed pool ID related defines
* Updated / renamed / cleanup buffer size related defines
* Added new #define BT_DEFAULT_BUFFER_SIZE
* Removed unused defines
Change-Id: Ib1fbf463d1e6fda2c71631347de0c365a37ba5ce
Pavlin Radoslavov [Wed, 23 Sep 2015 17:08:20 +0000 (10:08 -0700)]
GKI cleanup - Eliminate function GKI_get_pool_bufsize()
Change-Id: I87168157b9bb3e9d315c03b98a10d18b38cce3e1
Pavlin Radoslavov [Tue, 22 Sep 2015 18:27:30 +0000 (11:27 -0700)]
GKI cleanup - Eliminated function GKI_poolcount
Refactored function l2c_link_adjust_chnl_allocation.
Now the buffer quota computation is done without using the
GKI poll counts.
Change-Id: I669492becc9024c12f3360ea58a06188caa6420a
Pavlin Radoslavov [Fri, 18 Sep 2015 17:51:31 +0000 (10:51 -0700)]
GKI cleanup - Eliminate usage of pool buffers
* Replace usage of function GKI_getpoolbuf() with GKI_getbuf()
* Remove usage of function GKI_poolutilization()
* Remove usage of function GKI_poolfreecount()
Change-Id: Ide938192b878bbfb4912642c903fce548f2b5368
tturney [Mon, 21 Sep 2015 17:49:09 +0000 (10:49 -0700)]
Fix PAN and AV role switch war
Bug:
23740164
Change-Id: Ib26a64b624c711443201adc4fde6b041ecb0dde1
Andre Eisenbach [Sat, 19 Sep 2015 03:13:53 +0000 (20:13 -0700)]
Ensure thread priority is raised for media task / UIPC
Bug:
23978964
Change-Id: I36b6d05bb82eb0283eed3b465038d65890c4c245
Andre Eisenbach [Thu, 17 Sep 2015 22:16:20 +0000 (15:16 -0700)]
Change UHID socket to be non-blocking
On some platforms, the logs indicate that the BTU task is stalled by
UHID driver when writing the HID descriptor to the kernel. This patch
converts the UHID socket to non-blocking to avoid stalling the main
BTU task.
Bug:
23978964
Change-Id: I5a7a3e106fb2c967d68f077faedcd4fe62bbd912
Nitin Shivpure [Wed, 12 Aug 2015 12:45:11 +0000 (18:15 +0530)]
Check BR device count before initiating role switch
A case where DUT is acting as PANU device on BR/EDR link & also
acting as central on LE link. As LE link & PANU link need not to
be master & it's not a scatter-net scenario, because there is only
a BR link. So checking for BR device count before initiating role
switch to avoid continuous loop of role switches.
Cherry-picked from: https://partner-android-review.googlesource.com/#/c/376058/
Change-Id: I70e4041a71ba965f1f9e25729c3cfd20ae03d6b4
Bug:
23290136
Pavlin Radoslavov [Wed, 16 Sep 2015 20:30:26 +0000 (13:30 -0700)]
GKI cleanup - Eliminated function GKI_delay
Removed function GKI_delay from the GKI module, and replaced
it with a local static function inside file btif/src/btif_rc.c - the
only place it is (still) used.
Change-Id: Id8f3f700efd22d6e31c70aa8b1724ffa9afbc631
Sharvil Nanavati [Wed, 9 Sep 2015 22:56:17 +0000 (15:56 -0700)]
Add libpower as a dependency to all device targets that include libosi.
Bug:
23902077
Change-Id: Icc7119a2b3199310e2210d46f599da00261fdff6
tturney [Tue, 8 Sep 2015 21:42:09 +0000 (14:42 -0700)]
Allow BT inquiry while discovery is in progress.
BT Inquiry is disallowed when service discovery
is in progress. Innitially when GATT discovery
is in progress (crosskey pairing), it resulted
in inquiry requests being rejected. During an
insecure connection like OPP, bonding link key
is not stored. In an earlier patch (
b820aec7),
BR/EDR discovery was bypassed if the bonding was
temporary. However, this was not done for LE.
Applying the same logic to LE, resolved the
inquiry issue reported in this bug.
Bug:
23468169
Change-Id: I6111c80a420aeb0bc36a0393eb215c112512d251
Pavlin Radoslavov [Sat, 5 Sep 2015 00:55:09 +0000 (17:55 -0700)]
Eliminate recursive calling when handling GATT related errors
If there are errors when processing GATT related events (e.g.,
configuring the MTU), don't use recursive calls into
bta_gattc_sm_execute(), because it breaks the free-ing of some
of the memory.
Bug:
23756301
Change-Id: I3c685170e868ffbf4e488d2bb5a31904e3f7b39d
wang ping [Sat, 5 Sep 2015 17:48:09 +0000 (10:48 -0700)]
Fix issue where bluesleep idle timer is not started
Sometimes allow_device_sleep() is called before wake_assert, this result in transmit_done
does not start idle timer. This is because the "wake_state" does not match while
allow_device_sleep() is called before wake_assert() is called. So start idle timer
anyway when transmit_done is called.
Bug:
23754156
Change-Id: I5437aea0abc4b7f5cf847701e2d0a889c6823fcb
tturney [Mon, 31 Aug 2015 22:16:59 +0000 (15:16 -0700)]
Fix btwrite timer timeout for Angler (2/2)
When calculating the appropriate LPM's idle timeout,
the local chip name was NULL. This is fixed by calculating
LMP's idle timeout when the chip is enabling.
Bug:
23248798
Change-Id: I8ee2b28fb4363359e035e242fdcff8a736ee448c
Joshua Schwarz [Thu, 27 Aug 2015 21:15:26 +0000 (14:15 -0700)]
Implementation of net_test_bluedroid as a GTest.
Change-Id: If9fc9a26fe58858a107b8ad6ac9f1e757ba07f90