OSDN Git Service

android-x86/system-bt.git
7 years agoRefactor tGATT_BG_CONN_DEV am: 7cfd8391f6 am: 77157460ba am: 7b55503837
Jakub Pawlowski [Wed, 7 Jun 2017 01:44:16 +0000 (01:44 +0000)]
Refactor tGATT_BG_CONN_DEV am: 7cfd8391f6 am: 77157460ba am: 7b55503837
am: 3491d92903

Change-Id: I1e69aa803d3e25080cd9e485e69eefe1918de025

7 years agoRefactor tGATT_BG_CONN_DEV am: 7cfd8391f6 am: 77157460ba
Jakub Pawlowski [Wed, 7 Jun 2017 01:41:42 +0000 (01:41 +0000)]
Refactor tGATT_BG_CONN_DEV am: 7cfd8391f6 am: 77157460ba
am: 7b55503837

Change-Id: I3f1ef7c9daea0aee2769cc4386eb32b2d8c3e96f

7 years agoRefactor tGATT_BG_CONN_DEV am: 7cfd8391f6
Jakub Pawlowski [Wed, 7 Jun 2017 01:39:45 +0000 (01:39 +0000)]
Refactor tGATT_BG_CONN_DEV am: 7cfd8391f6
am: 77157460ba

Change-Id: I0d5bc72270c5d7b2cd88cb5e91ace28a07e2cc99

7 years agoRefactor tGATT_BG_CONN_DEV
Jakub Pawlowski [Wed, 7 Jun 2017 01:37:14 +0000 (01:37 +0000)]
Refactor tGATT_BG_CONN_DEV
am: 7cfd8391f6

Change-Id: Ie9855cd0da4a631303cb4228928587b4ee3abe99

7 years agoRefactor tGATT_BG_CONN_DEV
Jakub Pawlowski [Tue, 6 Jun 2017 17:03:07 +0000 (10:03 -0700)]
Refactor tGATT_BG_CONN_DEV

* Use list for keeping the devices instead of fixes array, get rid of
  the in_use field.
* Use unordered_set instead of array to keep gatt_if of apps interested
  in specific device.
* the in_use flag was never cleared before, this had the potential to
  fill the whole array when multiple devices were addred/removed to the
  whitelist. This issue is fixed now.

Test: compilation test
Change-Id: Id87c2ae9c5b0ce0887a4fa9be50e34d646d22a13

7 years agoMerge "Suppress false compiler warnings" am: 1e37a045a7 am: cbd6ec860d am: 2b64c1eb00
Ting-Yuan Huang [Wed, 7 Jun 2017 00:53:41 +0000 (00:53 +0000)]
Merge "Suppress false compiler warnings" am: 1e37a045a7 am: cbd6ec860d am: 2b64c1eb00
am: 544f01deaa

Change-Id: Ia48478fa59a447ab61673aac1c0a10da91172263

7 years agoMerge "Suppress false compiler warnings" am: 1e37a045a7 am: cbd6ec860d
Ting-Yuan Huang [Wed, 7 Jun 2017 00:40:09 +0000 (00:40 +0000)]
Merge "Suppress false compiler warnings" am: 1e37a045a7 am: cbd6ec860d
am: 2b64c1eb00

Change-Id: I7422a7ba773ebb1036cb8f4915b0e52e3b48f41b

7 years agoMerge "Suppress false compiler warnings" am: 1e37a045a7
Ting-Yuan Huang [Wed, 7 Jun 2017 00:38:09 +0000 (00:38 +0000)]
Merge "Suppress false compiler warnings" am: 1e37a045a7
am: cbd6ec860d

Change-Id: I0b1c8842ace8c0c0314d977a1ae7531dabaaa9ea

7 years agoMerge "Suppress false compiler warnings"
Ting-Yuan Huang [Wed, 7 Jun 2017 00:35:41 +0000 (00:35 +0000)]
Merge "Suppress false compiler warnings"
am: 1e37a045a7

Change-Id: I93f117b739af6a3ab0db85ee310186cdcea689db

7 years agoMerge "Suppress false compiler warnings"
Treehugger Robot [Wed, 7 Jun 2017 00:25:50 +0000 (00:25 +0000)]
Merge "Suppress false compiler warnings"

7 years agoLinux build fix am: 66e8571f6c am: 1f99591592 am: 1da224279c
Jakub Pawlowski [Wed, 7 Jun 2017 00:12:08 +0000 (00:12 +0000)]
Linux build fix am: 66e8571f6c am: 1f99591592 am: 1da224279c
am: a0946e07c1

Change-Id: Iaeb6426769e79ab75e090184467d5716cee263e9

7 years agoLinux build fix am: 66e8571f6c am: 1f99591592
Jakub Pawlowski [Tue, 6 Jun 2017 23:57:41 +0000 (23:57 +0000)]
Linux build fix am: 66e8571f6c am: 1f99591592
am: 1da224279c

Change-Id: Iebe58ffae32d0762a383a51ce1ae3ee175894e50

7 years agoLinux build fix am: 66e8571f6c
Jakub Pawlowski [Tue, 6 Jun 2017 23:54:08 +0000 (23:54 +0000)]
Linux build fix am: 66e8571f6c
am: 1f99591592

Change-Id: I4548a48d8ba1ce9025f75c3574b50e6ede6b8ab2

7 years agoLinux build fix
Jakub Pawlowski [Tue, 6 Jun 2017 23:52:41 +0000 (23:52 +0000)]
Linux build fix
am: 66e8571f6c

Change-Id: I351660a275f1d837c6c07f269580dbd7e11de0f9

7 years agoSuppress false compiler warnings
Ting-Yuan Huang [Tue, 9 May 2017 22:57:40 +0000 (15:57 -0700)]
Suppress false compiler warnings

In theory, static analyzer can't be 100% acurate for certain types of
analysis.

Bug: 38178471
Test: Built without seeing these warnings.
Change-Id: I63d2d02565cc040189ed70813eb42e06dd8c9f2a

7 years agoLinux build fix
Jakub Pawlowski [Tue, 6 Jun 2017 22:11:30 +0000 (15:11 -0700)]
Linux build fix

Change-Id: I2850577447a605877a8bc12f5ad852cacf4e0b3e

7 years agoGet rid of BTA_GATTC_API_REFRESH_EVT am: d7ee6f2e85 am: 96e7c2a740 am: 55418cf457
Jakub Pawlowski [Tue, 6 Jun 2017 21:53:40 +0000 (21:53 +0000)]
Get rid of BTA_GATTC_API_REFRESH_EVT am: d7ee6f2e85 am: 96e7c2a740 am: 55418cf457
am: bb1a19ce4d

Change-Id: Ie9ba9347fa624215ec5a7214527b85f1658524c0

7 years agoGet rid of trivial BTA_GATTC_ events am: 31a6bf4f11 am: 195f8c2599 am: 8984cf457f
Jakub Pawlowski [Tue, 6 Jun 2017 21:53:24 +0000 (21:53 +0000)]
Get rid of trivial BTA_GATTC_ events am: 31a6bf4f11 am: 195f8c2599 am: 8984cf457f
am: 155ae3d0de

Change-Id: I60130937330d0aace504f42eb7effe91f7dd2a07

7 years agoGet rid of BTA_GATTC_API_REFRESH_EVT am: d7ee6f2e85 am: 96e7c2a740
Jakub Pawlowski [Tue, 6 Jun 2017 21:40:14 +0000 (21:40 +0000)]
Get rid of BTA_GATTC_API_REFRESH_EVT am: d7ee6f2e85 am: 96e7c2a740
am: 55418cf457

Change-Id: I0173cb0f311c54618b60f67ca5033fde5debbb8c

7 years agoGet rid of trivial BTA_GATTC_ events am: 31a6bf4f11 am: 195f8c2599
Jakub Pawlowski [Tue, 6 Jun 2017 21:39:58 +0000 (21:39 +0000)]
Get rid of trivial BTA_GATTC_ events am: 31a6bf4f11 am: 195f8c2599
am: 8984cf457f

Change-Id: I160733d1e62357d9785c3c7f31b1a3c962ef51ad

7 years agoGet rid of BTA_GATTC_API_REFRESH_EVT am: d7ee6f2e85
Jakub Pawlowski [Tue, 6 Jun 2017 21:26:09 +0000 (21:26 +0000)]
Get rid of BTA_GATTC_API_REFRESH_EVT am: d7ee6f2e85
am: 96e7c2a740

Change-Id: I32957ad7b296c7b5d64d38698bc7edef48f2a6c5

7 years agoGet rid of trivial BTA_GATTC_ events am: 31a6bf4f11
Jakub Pawlowski [Tue, 6 Jun 2017 21:25:53 +0000 (21:25 +0000)]
Get rid of trivial BTA_GATTC_ events am: 31a6bf4f11
am: 195f8c2599

Change-Id: Ice81eee5f60a28b960dd2139d79c998bc84f43e9

7 years agoGet rid of BTA_GATTC_API_REFRESH_EVT
Jakub Pawlowski [Tue, 6 Jun 2017 21:20:58 +0000 (21:20 +0000)]
Get rid of BTA_GATTC_API_REFRESH_EVT
am: d7ee6f2e85

Change-Id: Ic9f253ab5489d133698cae3f243ccda7d78d1c62

7 years agoGet rid of trivial BTA_GATTC_ events
Jakub Pawlowski [Tue, 6 Jun 2017 21:20:43 +0000 (21:20 +0000)]
Get rid of trivial BTA_GATTC_ events
am: 31a6bf4f11

Change-Id: Id25b40895fae8722534e830f06532b62aac44d7b

7 years agoGet rid of BTA_GATTC_API_REFRESH_EVT
Jakub Pawlowski [Mon, 5 Jun 2017 19:42:45 +0000 (12:42 -0700)]
Get rid of BTA_GATTC_API_REFRESH_EVT

Test: compilation test
Change-Id: I631962183ac63d2b168005060bb1f0d4964b0884

7 years agoGet rid of trivial BTA_GATTC_ events
Jakub Pawlowski [Mon, 5 Jun 2017 19:20:04 +0000 (12:20 -0700)]
Get rid of trivial BTA_GATTC_ events

Test: compilation test
Change-Id: I8c705d1bb0532cbe0dd69b1f3b0b5d1a63534a23

7 years agoInitial DBus transport support am: 79c2ff968f am: 0c00f5664a am: 43ffbbe81f
Jakub Pawlowski [Tue, 6 Jun 2017 20:57:27 +0000 (20:57 +0000)]
Initial DBus transport support am: 79c2ff968f am: 0c00f5664a am: 43ffbbe81f
am: 51393cd234

Change-Id: I73b7d89ffc568ad0e26dbe40be792b17631246f6

7 years agoFix order of parameters to BTA_GATTC_Open am: 11410a31b1
Jakub Pawlowski [Tue, 6 Jun 2017 20:57:14 +0000 (20:57 +0000)]
Fix order of parameters to BTA_GATTC_Open am: 11410a31b1
am: 8ebf607111

Change-Id: I4dc35b81cc939eeb7a9abc5d3f9b19751dfcb5bc

7 years agoInitial DBus transport support am: 79c2ff968f am: 0c00f5664a
Jakub Pawlowski [Tue, 6 Jun 2017 20:55:46 +0000 (20:55 +0000)]
Initial DBus transport support am: 79c2ff968f am: 0c00f5664a
am: 43ffbbe81f

Change-Id: Id6150d77ca20f17ba6af59ef09b8efc8982f3250

7 years agoFix order of parameters to BTA_GATTC_Open
Jakub Pawlowski [Tue, 6 Jun 2017 20:55:19 +0000 (20:55 +0000)]
Fix order of parameters to BTA_GATTC_Open
am: 11410a31b1

Change-Id: Id66d9c2503bc391911a09884d77a4fc4ea0f0bb2

7 years agoInitial DBus transport support am: 79c2ff968f
Jakub Pawlowski [Tue, 6 Jun 2017 20:53:19 +0000 (20:53 +0000)]
Initial DBus transport support am: 79c2ff968f
am: 0c00f5664a

Change-Id: Icb9097f15cb87a5e864ad38fd2285161f57ae65d

7 years agoInitial DBus transport support
Jakub Pawlowski [Tue, 6 Jun 2017 20:51:19 +0000 (20:51 +0000)]
Initial DBus transport support
am: 79c2ff968f

Change-Id: If2e1458120b318d983acbc50cf5f9653e17f03f5

7 years agoInitial DBus transport support
Jakub Pawlowski [Mon, 31 Oct 2016 19:56:12 +0000 (12:56 -0700)]
Initial DBus transport support

This patch adds initial support for DBus transport on Linux. It exposes
initial implementation of Adapter that can be Enabled and Disabled. One
can also introspect the interface to find the exposed methods. Further
patches will extend it's functionality.

Test: ninja -C out/Default -j 40
Change-Id: I173cc752b8d8aaa8706ed36f75f5a043cc987b1a

7 years agoFix order of parameters to BTA_GATTC_Open am: 47474c3e58 am: 73275ae076 am: 3923f52175
Jakub Pawlowski [Tue, 6 Jun 2017 00:28:48 +0000 (00:28 +0000)]
Fix order of parameters to BTA_GATTC_Open am: 47474c3e58 am: 73275ae076 am: 3923f52175
am: 66570f8572

Change-Id: If261005ccd39e204abf1d0b2849afd44a2e4dec8

7 years agoFix order of parameters to BTA_GATTC_Open am: 47474c3e58 am: 73275ae076
Jakub Pawlowski [Tue, 6 Jun 2017 00:16:50 +0000 (00:16 +0000)]
Fix order of parameters to BTA_GATTC_Open am: 47474c3e58 am: 73275ae076
am: 3923f52175

Change-Id: Id7001fa6be73111e26a29cef7acb8f2230a95806

7 years agoFix order of parameters to BTA_GATTC_Open am: 47474c3e58
Jakub Pawlowski [Tue, 6 Jun 2017 00:11:50 +0000 (00:11 +0000)]
Fix order of parameters to BTA_GATTC_Open am: 47474c3e58
am: 73275ae076

Change-Id: Iad0473d3cd1c6ef355c410b2fb50578856d24116

7 years agoFix order of parameters to BTA_GATTC_Open
Jakub Pawlowski [Tue, 6 Jun 2017 00:06:50 +0000 (00:06 +0000)]
Fix order of parameters to BTA_GATTC_Open
am: 47474c3e58

Change-Id: I4a305269942e19b5a33521f3071cf24253db81c4

7 years agoFix order of parameters to BTA_GATTC_Open
Jakub Pawlowski [Sat, 3 Jun 2017 23:39:04 +0000 (16:39 -0700)]
Fix order of parameters to BTA_GATTC_Open

Different order of parameters in different flavours of method caused
bug in btif_gatt_client.cc, where every client would be started as
opportunistic. This issue was introduced in commit
16bb48b320cde54a1a06a525f4d9be1421689649

Bug: 34951749
Test: sl4a GattReadTest was flaky without this patch
Change-Id: I243b11bd8e2c0da9f01cbd3eab95dc808bd54006

7 years agoFix order of parameters to BTA_GATTC_Open
Jakub Pawlowski [Sat, 3 Jun 2017 23:39:04 +0000 (16:39 -0700)]
Fix order of parameters to BTA_GATTC_Open

Different order of parameters in different flavours of method caused
bug in btif_gatt_client.cc, where every client would be started as
opportunistic. This issue was introduced in commit
16bb48b320cde54a1a06a525f4d9be1421689649

Bug: 34951749
Test: sl4a GattReadTest was flaky without this patch
Change-Id: I243b11bd8e2c0da9f01cbd3eab95dc808bd54006

7 years agoPass GATT cb's by reference and other style fixes am: f4c0292c63 am: f5de435643 am...
Jakub Pawlowski [Sat, 3 Jun 2017 02:43:19 +0000 (02:43 +0000)]
Pass GATT cb's by reference and other style fixes am: f4c0292c63 am: f5de435643 am: 75c8ce2a50
am: 1e76bd7e38

Change-Id: I6fc85537118159e1c8592baa14c08ba940ac3527

7 years agoUse std::queue for pending_enc_clcb am: eb3ab848f8 am: 8db401f92d am: 8395ce7081
Jakub Pawlowski [Sat, 3 Jun 2017 02:43:16 +0000 (02:43 +0000)]
Use std::queue for pending_enc_clcb am: eb3ab848f8 am: 8db401f92d am: 8395ce7081
am: 0d810425bf

Change-Id: I3d372d48ddc10d323b0b4de9a6aec458bbb996ff

7 years agoPass GATT cb's by reference and other style fixes am: f4c0292c63 am: f5de435643
Jakub Pawlowski [Sat, 3 Jun 2017 02:39:34 +0000 (02:39 +0000)]
Pass GATT cb's by reference and other style fixes am: f4c0292c63 am: f5de435643
am: 75c8ce2a50

Change-Id: Ia56eab5e39f6c374d4f6cc3263cab4083ac557f4

7 years agoUse std::queue for pending_enc_clcb am: eb3ab848f8 am: 8db401f92d
Jakub Pawlowski [Sat, 3 Jun 2017 02:39:31 +0000 (02:39 +0000)]
Use std::queue for pending_enc_clcb am: eb3ab848f8 am: 8db401f92d
am: 8395ce7081

Change-Id: I5dc613353cb29ff39aa84228e2d142c369a2b0b1

7 years agoPass GATT cb's by reference and other style fixes am: f4c0292c63
Jakub Pawlowski [Sat, 3 Jun 2017 02:35:34 +0000 (02:35 +0000)]
Pass GATT cb's by reference and other style fixes am: f4c0292c63
am: f5de435643

Change-Id: Ib31990fdb1301bdba18c821b1a98709d80935ae1

7 years agoUse std::queue for pending_enc_clcb am: eb3ab848f8
Jakub Pawlowski [Sat, 3 Jun 2017 02:35:31 +0000 (02:35 +0000)]
Use std::queue for pending_enc_clcb am: eb3ab848f8
am: 8db401f92d

Change-Id: I81e646cd0929fd5cc6bdd00fc3adb1c6aacf9f1b

7 years agoPass GATT cb's by reference and other style fixes
Jakub Pawlowski [Sat, 3 Jun 2017 02:32:02 +0000 (02:32 +0000)]
Pass GATT cb's by reference and other style fixes
am: f4c0292c63

Change-Id: Idac488cdb04185733e47f796a6bbac2c607e28fa

7 years agoUse std::queue for pending_enc_clcb
Jakub Pawlowski [Sat, 3 Jun 2017 02:32:00 +0000 (02:32 +0000)]
Use std::queue for pending_enc_clcb
am: eb3ab848f8

Change-Id: Ia8a712f92f922818a5c68e8476864f535156a1b8

7 years agoPass GATT cb's by reference and other style fixes
Jakub Pawlowski [Tue, 30 May 2017 18:21:04 +0000 (11:21 -0700)]
Pass GATT cb's by reference and other style fixes

Test: compilation test
Change-Id: I410d0d0a0bf49b9f3ca5e034c66fe8e82661cee7

7 years agoUse std::queue for pending_enc_clcb
Jakub Pawlowski [Tue, 30 May 2017 16:59:54 +0000 (09:59 -0700)]
Use std::queue for pending_enc_clcb

Test: 62188929
Change-Id: Ide07f15c5e5b6bc8b93ac350081b7bef7c7b3938

7 years agoFix params of SetPeriodicAdvertisingParameters am: 0af739bcb4
Sunny Kapdi [Fri, 2 Jun 2017 01:17:33 +0000 (01:17 +0000)]
Fix params of SetPeriodicAdvertisingParameters am: 0af739bcb4
am: cb4fa74910

Change-Id: Iefa9f772b66513a081008825b47382d8f6907025

7 years agoFix params of SetPeriodicAdvertisingParameters
Sunny Kapdi [Fri, 2 Jun 2017 01:11:17 +0000 (01:11 +0000)]
Fix params of SetPeriodicAdvertisingParameters
am: 0af739bcb4

Change-Id: I9cda61113a2347ff778530cdabc254e14d367f52

7 years agoFix params of SetPeriodicAdvertisingParameters am: a85cb8ea67 am: 426325f728 am:...
Sunny Kapdi [Fri, 2 Jun 2017 00:35:09 +0000 (00:35 +0000)]
Fix params of SetPeriodicAdvertisingParameters am: a85cb8ea67 am: 426325f728 am: aa563f712e
am: ff65e5c7aa

Change-Id: I219ca26ccc088409127d9ffaa3cfab35aed9fce1

7 years agoFix params of SetPeriodicAdvertisingParameters am: a85cb8ea67 am: 426325f728
Sunny Kapdi [Fri, 2 Jun 2017 00:21:42 +0000 (00:21 +0000)]
Fix params of SetPeriodicAdvertisingParameters am: a85cb8ea67 am: 426325f728
am: aa563f712e

Change-Id: Ia3871cc56f482c4c30252b0bbb5d780d58774e9c

7 years agoFix params of SetPeriodicAdvertisingParameters am: a85cb8ea67
Sunny Kapdi [Fri, 2 Jun 2017 00:18:42 +0000 (00:18 +0000)]
Fix params of SetPeriodicAdvertisingParameters am: a85cb8ea67
am: 426325f728

Change-Id: Ia4f5af5a3f337123b872e6e2a94fcb21039cdd44

7 years agoFix params of SetPeriodicAdvertisingParameters
Sunny Kapdi [Fri, 2 Jun 2017 00:16:11 +0000 (00:16 +0000)]
Fix params of SetPeriodicAdvertisingParameters
am: a85cb8ea67

Change-Id: I56a6b3cb07bc22afbe485476ae9bc79b8e68c7a6

7 years agoFix params of SetPeriodicAdvertisingParameters
Sunny Kapdi [Thu, 1 Jun 2017 21:34:03 +0000 (14:34 -0700)]
Fix params of SetPeriodicAdvertisingParameters

Fix the sequence of SetPeriodicAdvertisingParameters
in the hci_cmd

Bug: 62268713
Change-Id: Ibdcd362458e9d7ee2f95106a2aefa76e1c264103

7 years agoMerge "GATT: Fixed typo while notifying connection update" into oc-dev am: 044e4c3de0
Avish Shah [Thu, 1 Jun 2017 22:42:48 +0000 (22:42 +0000)]
Merge "GATT: Fixed typo while notifying connection update" into oc-dev am: 044e4c3de0
am: a95bc5de74

Change-Id: I2fad95e3d2a389edeaf38c1bd09e704523c5b1f8

7 years agoMerge "GATT: Fixed typo while notifying connection update" into oc-dev
Avish Shah [Thu, 1 Jun 2017 22:39:02 +0000 (22:39 +0000)]
Merge "GATT: Fixed typo while notifying connection update" into oc-dev
am: 044e4c3de0

Change-Id: Idfa23fc3b466a57d1514a58ea6b18773a3fcfc49

7 years agoMerge "GATT: Fixed typo while notifying connection update" into oc-dev
TreeHugger Robot [Thu, 1 Jun 2017 22:36:18 +0000 (22:36 +0000)]
Merge "GATT: Fixed typo while notifying connection update" into oc-dev

7 years agoFix params of SetPeriodicAdvertisingParameters
Sunny Kapdi [Thu, 1 Jun 2017 21:34:03 +0000 (14:34 -0700)]
Fix params of SetPeriodicAdvertisingParameters

Fix the sequence of SetPeriodicAdvertisingParameters
in the hci_cmd

Bug: 62268713
Change-Id: Ibdcd362458e9d7ee2f95106a2aefa76e1c264103

7 years agoMerge changes I90a48db4,I8b9815a0 into oc-dev am: 4d92cda9c7
Myles Watson [Thu, 1 Jun 2017 21:00:10 +0000 (21:00 +0000)]
Merge changes I90a48db4,I8b9815a0 into oc-dev am: 4d92cda9c7
am: f97a090787

Change-Id: Iffc0917f7719cc5a82bda965332d00ebcc24122f

7 years agoMerge changes I90a48db4,I8b9815a0 into oc-dev
Myles Watson [Thu, 1 Jun 2017 20:56:44 +0000 (20:56 +0000)]
Merge changes I90a48db4,I8b9815a0 into oc-dev
am: 4d92cda9c7

Change-Id: I565e5ad59f8200393deeb359349b012c1cca9967

7 years agoGATT: Fixed typo while notifying connection update am: 44a1c7eafb am: 5b707312f9...
Avish Shah [Thu, 1 Jun 2017 20:56:25 +0000 (20:56 +0000)]
GATT: Fixed typo while notifying connection update am: 44a1c7eafb am: 5b707312f9 am: 3d3e8dd7bc
am: f5a1d5e286

Change-Id: I4f93329742763b787cc8a95a17824cc5ed38307e

7 years agoGATT: Fixed typo while notifying connection update am: 44a1c7eafb am: 5b707312f9
Avish Shah [Thu, 1 Jun 2017 20:50:55 +0000 (20:50 +0000)]
GATT: Fixed typo while notifying connection update am: 44a1c7eafb am: 5b707312f9
am: 3d3e8dd7bc

Change-Id: I0227edded7be640d427bee2a76f0803c2942ab9d

7 years agoMerge changes I90a48db4,I8b9815a0 into oc-dev
TreeHugger Robot [Thu, 1 Jun 2017 20:50:11 +0000 (20:50 +0000)]
Merge changes I90a48db4,I8b9815a0 into oc-dev

* changes:
  HCI: Improve timeout handling
  HCI: Get debug info from the firmware on timeout

7 years agoGATT: Fixed typo while notifying connection update am: 44a1c7eafb
Avish Shah [Thu, 1 Jun 2017 20:48:23 +0000 (20:48 +0000)]
GATT: Fixed typo while notifying connection update am: 44a1c7eafb
am: 5b707312f9

Change-Id: I82d5a6b6c5f7bc3a024d434555bb410113a470f7

7 years agoGATT: Fixed typo while notifying connection update
Avish Shah [Thu, 1 Jun 2017 20:46:28 +0000 (20:46 +0000)]
GATT: Fixed typo while notifying connection update
am: 44a1c7eafb

Change-Id: I70cc6c866889d4328153c5170b564e12ab6a4b6a

7 years agoGATT: Fixed typo while notifying connection update
Avish Shah [Wed, 31 May 2017 05:13:57 +0000 (10:43 +0530)]
GATT: Fixed typo while notifying connection update

Current conditions checks whether the app registered for
PHY_UPDATE instead it should check for CONN_UPDATE.

Bug: 62206018
Test: Manual
Change-Id: Ie9d068a24d13ea0b186b0ca874531aa4ffd1121f
(cherry picked from commit 44a1c7eafb2db9012c26dd622726655f19fbc0b7)

7 years agoGATT: Fixed typo while notifying connection update
Avish Shah [Wed, 31 May 2017 05:13:57 +0000 (10:43 +0530)]
GATT: Fixed typo while notifying connection update

Current conditions checks whether the app registered for
PHY_UPDATE instead it should check for CONN_UPDATE.

Bug: 62206018
Test: Manual
Change-Id: Ie9d068a24d13ea0b186b0ca874531aa4ffd1121f

7 years agoDO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX am: dae59d3b83 -s...
Yamei Du [Thu, 1 Jun 2017 07:57:23 +0000 (07:57 +0000)]
DO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX am: dae59d3b83  -s ours am: 0d0e9514ad  -s ours am: e6befb96a8  -s ours
am: 29d308097a  -s ours

Change-Id: I89dd5fcdf778ab9fd1721d89154faa51ce95842b

7 years agoDO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX am: dae59d3b83 -s...
Yamei Du [Thu, 1 Jun 2017 07:57:13 +0000 (07:57 +0000)]
DO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX am: dae59d3b83  -s ours am: 0d0e9514ad  -s ours am: 40d02aabb5  -s ours
am: 9f5bcf0440  -s ours

Change-Id: I6bd32bfcdc6c4d5dde5edfe71314d422f291dc27

7 years agoDO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX am: dae59d3b83 -s...
Yamei Du [Thu, 1 Jun 2017 07:52:36 +0000 (07:52 +0000)]
DO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX am: dae59d3b83  -s ours am: 0d0e9514ad  -s ours
am: e6befb96a8  -s ours

Change-Id: I61bf69bf501502d3adf7b2028e07d4da74d75768

7 years agoDO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX am: dae59d3b83 -s...
Yamei Du [Thu, 1 Jun 2017 07:51:59 +0000 (07:51 +0000)]
DO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX am: dae59d3b83  -s ours am: 0d0e9514ad  -s ours
am: 40d02aabb5  -s ours

Change-Id: I33cb779c17b49f2bdf5512d92d71950c71ee0754

7 years agoDO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX am: dae59d3b83 -s...
Yamei Du [Thu, 1 Jun 2017 07:49:58 +0000 (07:49 +0000)]
DO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX am: dae59d3b83  -s ours
am: 0d0e9514ad  -s ours

Change-Id: I37e10ab29d083a8d16e756caf3b094c188692d73

7 years agoDO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX am: dae59d3b83 -s...
Yamei Du [Thu, 1 Jun 2017 07:49:58 +0000 (07:49 +0000)]
DO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX am: dae59d3b83  -s ours
am: 0d0e9514ad  -s ours

Change-Id: I81f931fc749ae4a9f149b6ddb183c282209e8e0c

7 years agoDO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX
Yamei Du [Thu, 1 Jun 2017 07:47:29 +0000 (07:47 +0000)]
DO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX
am: dae59d3b83  -s ours

Change-Id: I2c48b9c67afda8ba35bfac258031de6909d1af12

7 years agoDO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX
Yamei Du [Wed, 18 Nov 2015 09:28:07 +0000 (17:28 +0800)]
DO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX

FW ACL buffer overflow.
One more ACL packet was sent to FW which is unexpected.

fix l2cap TX control defect.
Call fixed channel TX complete cb after packets is send to lower.

Bug: 26763700
Tested: manual
Change-Id: Iaba14a11c1583da2a72769ebd096e0baedf857c3
CR-Id: ALPS02404396

7 years agoMerge "HSP: Use peer_version during SCO setup" into oc-dev am: d6850928b0
Jack He [Wed, 31 May 2017 23:00:24 +0000 (23:00 +0000)]
Merge "HSP: Use peer_version during SCO setup" into oc-dev am: d6850928b0
am: 6e5c00cefe

Change-Id: I85d288e7681ecd8f8deff9d4dfc4f3b68166205c

7 years agoMerge "HSP: Use peer_version during SCO setup" into oc-dev
Jack He [Wed, 31 May 2017 22:58:24 +0000 (22:58 +0000)]
Merge "HSP: Use peer_version during SCO setup" into oc-dev
am: d6850928b0

Change-Id: I2f0b67f0b3e4af86e0e99ab496bee7b2badd8bff

7 years agoMerge "HSP: Use peer_version during SCO setup" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 22:54:03 +0000 (22:54 +0000)]
Merge "HSP: Use peer_version during SCO setup" into oc-dev

7 years agoHCI: Improve timeout handling
Myles Watson [Wed, 24 May 2017 20:16:40 +0000 (13:16 -0700)]
HCI: Improve timeout handling

Remove pending commands before enqueueing new ones and log all
pending commands when there is a timeout.

Bug: 37298084
Test: set the timeout to 20ms
Change-Id: I90a48db46a78f75dd78e468ee2d5c948afc1850e
(cherry picked from commit 4788821a0b3c47645deacb3b0047addf192956e2)

7 years agoHCI: Get debug info from the firmware on timeout
Myles Watson [Tue, 9 May 2017 23:50:00 +0000 (16:50 -0700)]
HCI: Get debug info from the firmware on timeout

Bug: 37298084
Test: set the timeout to 20ms

Change-Id: I8b9815a03a15dcb6ce78c0692874b55cb4fc07bc
(cherry picked from commit 2bfb56a2a92c897c8c0648674c51197fa8fe7f0a)

7 years agoHCI: Improve timeout handling am: 4788821a0b am: 5540318111 am: e41a7509e6
Myles Watson [Wed, 31 May 2017 19:46:18 +0000 (19:46 +0000)]
HCI: Improve timeout handling am: 4788821a0b am: 5540318111 am: e41a7509e6
am: 1147b7443c

Change-Id: I17c0eead5613e8f7fad551e509605b4caddef749

7 years agoHCI: Get debug info from the firmware on timeout am: 2bfb56a2a9 am: ecb5b9bf3e am...
Myles Watson [Wed, 31 May 2017 19:46:04 +0000 (19:46 +0000)]
HCI: Get debug info from the firmware on timeout am: 2bfb56a2a9 am: ecb5b9bf3e am: e9a5b7563b
am: bb6cd314d4

Change-Id: Idd62eacff3d60e03d2effb81a228043b5335f3f1

7 years agoHCI: Improve timeout handling am: 4788821a0b am: 5540318111
Myles Watson [Wed, 31 May 2017 19:41:00 +0000 (19:41 +0000)]
HCI: Improve timeout handling am: 4788821a0b am: 5540318111
am: e41a7509e6

Change-Id: I9964c5a9db4dea8a2f037a2974d8605135b8d1f4

7 years agoHCI: Get debug info from the firmware on timeout am: 2bfb56a2a9 am: ecb5b9bf3e
Myles Watson [Wed, 31 May 2017 19:36:24 +0000 (19:36 +0000)]
HCI: Get debug info from the firmware on timeout am: 2bfb56a2a9 am: ecb5b9bf3e
am: e9a5b7563b

Change-Id: Ic676c5889b59e12d1661d5b1ee2ef4650510627a

7 years agoHCI: Improve timeout handling am: 4788821a0b
Myles Watson [Wed, 31 May 2017 19:36:23 +0000 (19:36 +0000)]
HCI: Improve timeout handling am: 4788821a0b
am: 5540318111

Change-Id: I657b24b17171291efb90afee0c6c17d3ea403c6b

7 years agoHCI: Improve timeout handling
Myles Watson [Wed, 31 May 2017 19:32:26 +0000 (19:32 +0000)]
HCI: Improve timeout handling
am: 4788821a0b

Change-Id: I62191cdfa16e25bccc634b2a63dad938e5addd5b

7 years agoHCI: Get debug info from the firmware on timeout am: 2bfb56a2a9
Myles Watson [Wed, 31 May 2017 19:32:26 +0000 (19:32 +0000)]
HCI: Get debug info from the firmware on timeout am: 2bfb56a2a9
am: ecb5b9bf3e

Change-Id: I5832ba3e1c04aa41cf7bfed792d5825748c8c0fd

7 years agoHCI: Get debug info from the firmware on timeout
Myles Watson [Wed, 31 May 2017 19:28:24 +0000 (19:28 +0000)]
HCI: Get debug info from the firmware on timeout
am: 2bfb56a2a9

Change-Id: Ib6853df8cf6f07707d5531719c10bd68d86211a1

7 years agoHCI: Improve timeout handling
Myles Watson [Wed, 24 May 2017 20:16:40 +0000 (13:16 -0700)]
HCI: Improve timeout handling

Remove pending commands before enqueueing new ones and log all
pending commands when there is a timeout.

Bug: 37298084
Test: set the timeout to 20ms
Change-Id: I90a48db46a78f75dd78e468ee2d5c948afc1850e

7 years agoHCI: Get debug info from the firmware on timeout
Myles Watson [Tue, 9 May 2017 23:50:00 +0000 (16:50 -0700)]
HCI: Get debug info from the firmware on timeout

Bug: 37298084
Test: set the timeout to 20ms

Change-Id: I8b9815a03a15dcb6ce78c0692874b55cb4fc07bc

7 years agoMerge "HFP: Enable in-band ringing by default (2/2)"
TreeHugger Robot [Wed, 31 May 2017 03:36:15 +0000 (03:36 +0000)]
Merge "HFP: Enable in-band ringing by default (2/2)"

7 years agoMerge "GATT: Interop fix for service changed indications" into oc-dev am: 3b5c89a70b
Myles Watson [Wed, 31 May 2017 02:03:48 +0000 (02:03 +0000)]
Merge "GATT: Interop fix for service changed indications" into oc-dev am: 3b5c89a70b
am: 1a5c8b2af4

Change-Id: I1a06fbef19d77b52fd61b7d385db32a8c5b0975f

7 years agoMerge "GATT: Interop fix for service changed indications" into oc-dev
Myles Watson [Wed, 31 May 2017 01:59:16 +0000 (01:59 +0000)]
Merge "GATT: Interop fix for service changed indications" into oc-dev
am: 3b5c89a70b

Change-Id: Iefdbe711a8ffbadd53e24c44697b9a1a4c0a3734

7 years agoMerge "GATT: Interop fix for service changed indications" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 01:51:34 +0000 (01:51 +0000)]
Merge "GATT: Interop fix for service changed indications" into oc-dev

7 years agoMerge "DO NOT MERGE ANYWHERE Fix connect second BLE fail while BREDR coexist am:...
Ruina Liu [Wed, 31 May 2017 00:54:17 +0000 (00:54 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix connect second BLE fail while BREDR coexist am: e90e72bb82  -s ours am: c139d021b2  -s ours am: 75f2b19b28  -s ours" into oc-dev-plus-aosp
am: 791ee1fb82  -s ours

Change-Id: Id0d22a37b0b9caf6c7bc456789c75022603a8e18

7 years agoDO NOT MERGE ANYWHERE Fix connect second BLE fail while BREDR coexist am: e90e72bb82...
Ruina Liu [Wed, 31 May 2017 00:54:05 +0000 (00:54 +0000)]
DO NOT MERGE ANYWHERE Fix connect second BLE fail while BREDR coexist am: e90e72bb82  -s ours am: c139d021b2  -s ours am: 26d7a28ed1  -s ours
am: 5ebab45ca5  -s ours

Change-Id: Iddf23919f509d0f51b27e2dd795b91cc9e55eb57

7 years agoMerge "DO NOT MERGE ANYWHERE Fix connect second BLE fail while BREDR coexist am:...
Android Build Merger (Role) [Wed, 31 May 2017 00:46:20 +0000 (00:46 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix connect second BLE fail while BREDR coexist am: e90e72bb82  -s ours am: c139d021b2  -s ours am: 75f2b19b28  -s ours" into oc-dev-plus-aosp

7 years agoDO NOT MERGE ANYWHERE Fix connect second BLE fail while BREDR coexist am: e90e72bb82...
Ruina Liu [Wed, 31 May 2017 00:46:15 +0000 (00:46 +0000)]
DO NOT MERGE ANYWHERE Fix connect second BLE fail while BREDR coexist am: e90e72bb82  -s ours am: c139d021b2  -s ours
am: 75f2b19b28  -s ours

Change-Id: I037a7a68bd70a1e9bc2a84a8f6e22d0fd1458526