OSDN Git Service

android-x86/system-bt.git
8 years agoresolve merge (with -s ours) of e40c734e67 to master.
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

8 years agoam 91c7bdc6: am 9f1c9ad8: GKI cleanup - Moved struct TIMER_LIST_ENT to OSI
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

8 years agoam ae5a6159: am 1a3844f9: GKI cleanup - Replaced usage of GKI queue with OSI fixed_queue
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

8 years agoresolve merge conflicts of 2f1fd11c01 to master.
Pavlin Radoslavov [Tue, 20 Oct 2015 17:22:23 +0000 (10:22 -0700)]
resolve merge conflicts of 2f1fd11c01 to master.

Change-Id: Ie4a92c10f123554af236b1a362363b558dbaa368

8 years agoMerge commit 'e71c667e24e77144781835fcbaedddfc841e88c3'
Qiwen Zhao [Tue, 20 Oct 2015 02:16:44 +0000 (19:16 -0700)]
Merge commit 'e71c667e24e77144781835fcbaedddfc841e88c3'

8 years agoam 51d14a76: am 89ba148d: Disable opening network debug ports for security reasons
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

8 years agoam b4ccca65: resolved conflicts for 2181f1a4 to stage-aosp-master
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

8 years agoresolved conflicts for 0b681505 to master
Pavlin Radoslavov [Mon, 19 Oct 2015 22:33:07 +0000 (15:33 -0700)]
resolved conflicts for 0b681505 to master

Change-Id: I342341e24e6cb06bbd6074aec30be0b40a3feeac

8 years agoresolved conflicts for 16424e5e to master
Pavlin Radoslavov [Mon, 19 Oct 2015 22:19:18 +0000 (15:19 -0700)]
resolved conflicts for 16424e5e to master

Change-Id: I33b2b627bf986c6d120acf8cf507d7884611a4ec

8 years agoresolved conflicts for edf3e911 to master
Pavlin Radoslavov [Mon, 19 Oct 2015 22:02:01 +0000 (15:02 -0700)]
resolved conflicts for edf3e911 to master

Change-Id: Ie7030e681a6a92246aa772198c8c1130b5f1786c

8 years agoam 36762636: (-s ours) am 41a842af: am 2e3d006b: GKI cleanup - Eliminate usage of...
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

8 years agoam 91c7bdc6: am 9f1c9ad8: GKI cleanup - Moved struct TIMER_LIST_ENT 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

8 years agoam ae5a6159: am 1a3844f9: GKI cleanup - Replaced usage of GKI queue with OSI fixed_queue
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

8 years agoam 5de9c923: am 1eb1ea0c: GKI cleanup - Moved functions GKI_disable() and GKI_enable...
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

8 years agoam b22aeb23: resolved conflicts for c196f214 to stage-aosp-master
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

8 years agoam 258c2538: GKI cleanup - moved GKI buffer allocation wrappers to OSI
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

8 years agoam 9f1c9ad8: GKI cleanup - Moved struct TIMER_LIST_ENT 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

8 years agoam 1a3844f9: GKI cleanup - Replaced usage of GKI queue with OSI fixed_queue
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

8 years agoam 1eb1ea0c: GKI cleanup - Moved functions GKI_disable() and GKI_enable() to OSI
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

8 years agoam 3445b4a7: am 3d3810fe: am 6b24485c: Fix PAN and AV role switch war
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

8 years agoam 12abc3cb: am 3f236aa1: am 410970f2: Ensure thread priority is raised for media...
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

8 years agoam 4f1f20f4: am 1535b55c: am 8c24123f: Change UHID socket to be non-blocking
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

8 years agoam 662545ac: am 2ae635f4: am 7f2eed69: Check BR device count before initiating role...
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

8 years agoresolved conflicts for c196f214 to stage-aosp-master
Pavlin Radoslavov [Mon, 19 Oct 2015 20:24:32 +0000 (13:24 -0700)]
resolved conflicts for c196f214 to stage-aosp-master

Change-Id: I3c8acd59271180d5c11760d08ea960bb90040a8e

8 years agoresolved conflicts for a7a277cf to master
Pavlin Radoslavov [Mon, 19 Oct 2015 20:09:47 +0000 (13:09 -0700)]
resolved conflicts for a7a277cf to master

Change-Id: I63d0a0742a5476f5b951f10956b726810882565c

8 years agoam 51d14a76: am 89ba148d: Disable opening network debug ports for security reasons
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

8 years agoam b4ccca65: resolved conflicts for 2181f1a4 to stage-aosp-master
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

8 years agoam 89ba148d: Disable opening network debug ports for security reasons
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

8 years agoam 3880a381: am 16c682a7: am de86bfa2: Add libpower as a dependency to all device...
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.

8 years agoam 152dda92: am e1beca8b: am 20a1555a: Allow BT inquiry while discovery is in progress.
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.

8 years agoam 800f0bd2: am 78f84da0: am 7b4fdb40: Eliminate recursive calling when handling...
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

8 years agoam 76d13f8d: am de5a6f38: am aafe557b: Fix issue where bluesleep idle timer is not...
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

8 years agoam cb7e8f9b: am 4d99e011: am 530f7727: Fix btwrite timer timeout for Angler (2/2)
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)

8 years agoam e9ab8a36: am 8bad5d06: am 9d0965c9: Implementation of net_test_bluedroid as a...
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.

8 years agoam 9b8f7c62: am cc504635: am fda32d91: LE Multi-Advertising State Change Sub-event...
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

8 years agoam 1d5fe5c4: am 958f09b6: am 4602429d: Fix incorrect SetConnScanParam function mapping
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

8 years agoam 1948336c: am a887e765: am 11026214: Enable clang compilation.
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.

8 years agoam c8eb3f77: am 7deacad6: am 3858011b: Send current RPA instead of pseudo-address...
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.

8 years agoam a4d32b59: am 6106a1b3: am f34d336a: (-s ours) A2DP audio HAL: implement out_get_pr...
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()

8 years agoam 5e20685e: am 22c1d4fe: am 28f294b9: Load factory Bluetooth address from system...
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

8 years agoam 97018a4c: am 09e9dec4: am 6a42cbdb: Add a SCO routing command to net_hci.
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.

8 years agoam e37a7807: am 7fbf06c2: am 2af0bb6e: Fix merge discrepencies and resulting compile...
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

8 years agoresolved conflicts for 2181f1a4 to stage-aosp-master
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

8 years agoam e0f21ad7: am 70ae7de9: GKI cleanup - Remove GKI pool related defines
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

8 years agoam a0bec1cc: am 1d5b8592: GKI cleanup - Eliminate function GKI_get_pool_bufsize()
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()

8 years agoam 322cb6e7: am 21cce2ec: GKI cleanup - Eliminated function GKI_poolcount
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

8 years agoam 41a842af: am 2e3d006b: GKI cleanup - Eliminate usage of pool buffers
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

8 years agoam 3d3810fe: am 6b24485c: Fix PAN and AV role switch war
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

8 years agoam 3f236aa1: am 410970f2: Ensure thread priority is raised for media task / UIPC
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

8 years agoam 1535b55c: am 8c24123f: Change UHID socket to be non-blocking
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

8 years agoam 2ae635f4: am 7f2eed69: Check BR device count before initiating role switch
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

8 years agoam 4eaa995e: am 642f2330: GKI cleanup - Eliminated function GKI_delay
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

8 years agoam 16c682a7: am de86bfa2: Add libpower as a dependency to all device targets that...
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.

8 years agoam e1beca8b: am 20a1555a: Allow BT inquiry while discovery is in progress.
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.

8 years agoam 78f84da0: am 7b4fdb40: Eliminate recursive calling when handling GATT related...
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

8 years agoam de5a6f38: am aafe557b: Fix issue where bluesleep idle timer is not started
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

8 years agoam 4d99e011: am 530f7727: Fix btwrite timer timeout for Angler (2/2)
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)

8 years agoam 8bad5d06: am 9d0965c9: Implementation of net_test_bluedroid as a GTest.
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.

8 years agoam cc504635: am fda32d91: LE Multi-Advertising State Change Sub-event Wrong Variable...
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

8 years agoam 958f09b6: am 4602429d: Fix incorrect SetConnScanParam function mapping
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

8 years agoam a887e765: am 11026214: Enable clang compilation.
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.

8 years agoam 7deacad6: am 3858011b: Send current RPA instead of pseudo-address on connect.
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.

8 years agoam 6106a1b3: am f34d336a: (-s ours) A2DP audio HAL: implement out_get_presentation_po...
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()

8 years agoam 70ae7de9: GKI cleanup - Remove GKI pool related defines
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

8 years agoam 1d5b8592: GKI cleanup - Eliminate function GKI_get_pool_bufsize()
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()

8 years agoam 21cce2ec: GKI cleanup - Eliminated function GKI_poolcount
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

8 years agoam 2e3d006b: GKI cleanup - Eliminate usage of pool buffers
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

8 years agoam 6b24485c: Fix PAN and AV role switch war
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

8 years agoam 410970f2: Ensure thread priority is raised for media task / UIPC
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

8 years agoam 8c24123f: Change UHID socket to be non-blocking
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

8 years agoam 7f2eed69: Check BR device count before initiating role switch
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

8 years agoam 642f2330: GKI cleanup - Eliminated function GKI_delay
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

8 years agoam de86bfa2: Add libpower as a dependency to all device targets that include libosi.
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.

8 years agoam 20a1555a: Allow BT inquiry while discovery is in progress.
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.

8 years agoam 7b4fdb40: Eliminate recursive calling when handling GATT related errors
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

8 years agoam aafe557b: Fix issue where bluesleep idle timer is not started
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

8 years agoam 530f7727: Fix btwrite timer timeout for Angler (2/2)
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)

8 years agoam 9d0965c9: Implementation of net_test_bluedroid as a GTest.
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.

8 years agoam fda32d91: LE Multi-Advertising State Change Sub-event Wrong Variable Type
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

8 years agoam 4602429d: Fix incorrect SetConnScanParam function mapping
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

8 years agoam 11026214: Enable clang compilation.
Chih-Hung Hsieh [Mon, 19 Oct 2015 19:10:31 +0000 (12:10 -0700)]
am 11026214: Enable clang compilation.

* commit '110262140c4ab383a27d19c08e33f5937bd09c11':
  Enable clang compilation.

8 years agoam 3858011b: Send current RPA instead of pseudo-address on connect.
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.

8 years agoam f34d336a: (-s ours) A2DP audio HAL: implement out_get_presentation_position()
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()

8 years agoam 22c1d4fe: am 28f294b9: Load factory Bluetooth address from system property
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

8 years agoam 09e9dec4: am 6a42cbdb: Add a SCO routing command to net_hci.
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.

8 years agoam 7fbf06c2: am 2af0bb6e: Fix merge discrepencies and resulting compile errors
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

8 years agoam 28f294b9: Load factory Bluetooth address from system property
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

8 years agoam 6a42cbdb: Add a SCO routing command to net_hci.
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.

8 years agoam 2af0bb6e: Fix merge discrepencies and resulting compile errors
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

8 years agoDO NOT MERGE Revert "DO NOT MERGE Use POSIX timer API for wake alarms instead of...
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.

8 years agoGKI cleanup - moved GKI buffer allocation wrappers to OSI
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

8 years agoGKI cleanup - Moved struct TIMER_LIST_ENT to OSI
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

8 years agoGKI cleanup - Replaced usage of GKI queue with OSI fixed_queue
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

8 years agoGKI cleanup - Moved functions GKI_disable() and GKI_enable() to OSI
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

8 years agoGKI cleanup - Moved GKI_get_os_tick_count() to OSI
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

8 years agoDisable opening network debug ports for security reasons
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

8 years agoFix PAN crash due to fd mismatch
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

8 years agoGKI cleanup - Remove GKI pool related defines
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

8 years agoGKI cleanup - Eliminate function GKI_get_pool_bufsize()
Pavlin Radoslavov [Wed, 23 Sep 2015 17:08:20 +0000 (10:08 -0700)]
GKI cleanup - Eliminate function GKI_get_pool_bufsize()

Change-Id: I87168157b9bb3e9d315c03b98a10d18b38cce3e1

8 years agoGKI cleanup - Eliminated function GKI_poolcount
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