OSDN Git Service
Pavlin Radoslavov [Thu, 21 Apr 2016 19:40:40 +0000 (19:40 +0000)]
Merge "Add missing init/destroy of state_lock mutex" into nyc-dev
am:
271e208b7a
* commit '
271e208b7a48a78664f34e1476a4542bf7b3f7d5':
Add missing init/destroy of state_lock mutex
Change-Id: I7b9db5ffc793bb8b712fc6f6be164ba2e4bd3b0c
TreeHugger Robot [Thu, 21 Apr 2016 19:36:59 +0000 (19:36 +0000)]
Merge "Add missing init/destroy of state_lock mutex" into nyc-dev
Marie Janssen [Thu, 21 Apr 2016 18:39:57 +0000 (18:39 +0000)]
btif: add count of devices loaded on startup
am:
a042f8a022
* commit '
a042f8a02288e69154c405bbdf93c412a14da8bd':
btif: add count of devices loaded on startup
Change-Id: I58f80ca8f26b1b43b27d8f861ea2267dfb9f54d6
Marie Janssen [Wed, 13 Apr 2016 19:43:03 +0000 (12:43 -0700)]
btif: add count of devices loaded on startup
Report devices initially loaded from the config file.
Also removes the config mutex from btif_debug_config_dump as the config
is not modified.
Bug:
27354612
Change-Id: I25033ce28744051412f0d2bd554f0651e807ba7c
Pavlin Radoslavov [Wed, 20 Apr 2016 19:06:08 +0000 (12:06 -0700)]
Add missing init/destroy of state_lock mutex
Add missing init/destroy of state_lock mutex inside file
btif_sock_l2cap.c.
Also, add a missing unlock for the same mutex.
Bug:
28296454
Change-Id: I48b8deb911d29e8dcc6b7243fd61fc3ba69046dd
Pavlin Radoslavov [Thu, 21 Apr 2016 17:56:32 +0000 (17:56 +0000)]
Add missing init/destroy of state_lock mutex am:
4aa6d30d1c
am:
e6d8a2a1b7
* commit '
e6d8a2a1b7a63326a4d9a6dd0b6f23c94a38596f':
Add missing init/destroy of state_lock mutex
Change-Id: I2f82048b0d60c0cb731cd4645b5afa809235f424
Pavlin Radoslavov [Thu, 21 Apr 2016 17:54:19 +0000 (17:54 +0000)]
Add missing init/destroy of state_lock mutex
am:
4aa6d30d1c
* commit '
4aa6d30d1cde7e261e240e0eb2afc0d5a1803757':
Add missing init/destroy of state_lock mutex
Change-Id: If067e17a1fb5885acbbde0768851666c29bb75f4
Pavlin Radoslavov [Wed, 20 Apr 2016 19:06:08 +0000 (12:06 -0700)]
Add missing init/destroy of state_lock mutex
Add missing init/destroy of state_lock mutex inside file
btif_sock_l2cap.c.
Also, add a missing unlock for the same mutex.
Bug:
28296454
Change-Id: I48b8deb911d29e8dcc6b7243fd61fc3ba69046dd
Bluetooth Build Test [Thu, 21 Apr 2016 15:51:25 +0000 (15:51 +0000)]
Fix sluggish HID devices am:
46b8d12b92
am:
6f0a6f757d
* commit '
6f0a6f757d8c6de5863c83d009529df0292fb414':
Fix sluggish HID devices
Change-Id: I6f94e486022b40d4a784adf0dfa74a67e972c1c3
Bluetooth Build Test [Thu, 21 Apr 2016 15:49:15 +0000 (15:49 +0000)]
Fix sluggish HID devices
am:
46b8d12b92
* commit '
46b8d12b92e74dc03cd17a77a3365cd4d96902f4':
Fix sluggish HID devices
Change-Id: I8e50c5a89094b31fd0e2400d2e060c9b06f4e356
Jakub Pawlowski [Thu, 21 Apr 2016 15:49:13 +0000 (15:49 +0000)]
Cleanup unnecessary logs
am:
5be7c78326
* commit '
5be7c7832613abbd5c7a00d447e82c3a45a27e24':
Cleanup unnecessary logs
Change-Id: I82e08c85170059ae2c3b9320223e1c300c755d7f
Bluetooth Build Test [Wed, 13 Apr 2016 14:39:53 +0000 (16:39 +0200)]
Fix sluggish HID devices
Right now, when connecting to HID devices, preferred connection
parameters are not being used. This is because of bug in GAP profile.
This make all HID devices use default connection parameters, which
mean that they behave sluggish. This patch fixes that by forcing
HID devices to re-read connection parameters on each reconnection.
This is a temporary workaround until GAP is rewritten.
Change-Id: I74b70ad8e96c29517cace808632fe4d8e0251994
Jakub Pawlowski [Tue, 12 Apr 2016 12:50:49 +0000 (05:50 -0700)]
Cleanup unnecessary logs
Bug:
27698756
Change-Id: I30b5e4b45d4b06e0264415e85949c7bf828f28c0
Bluetooth Build Test [Thu, 21 Apr 2016 00:02:31 +0000 (00:02 +0000)]
Enable test_vendor_lib compilation on Linux am:
aabb300
am:
8db0906
* commit '
8db0906884908ee8beb0e34f2a7ce2185d47f3f3':
Enable test_vendor_lib compilation on Linux
Change-Id: Iae95443e6c6886f3439853e675507c2d6f213264
Bluetooth Build Test [Wed, 20 Apr 2016 23:58:50 +0000 (23:58 +0000)]
Enable test_vendor_lib compilation on Linux
am:
aabb300
* commit '
aabb3008aa03ad95339cf1a818c025301cbc14d3':
Enable test_vendor_lib compilation on Linux
Change-Id: Ic75011df40615323592343247794769d66b99ba1
Bluetooth Build Test [Wed, 20 Apr 2016 19:35:28 +0000 (12:35 -0700)]
Enable test_vendor_lib compilation on Linux
Cristian Iorga [Wed, 20 Apr 2016 23:45:46 +0000 (23:45 +0000)]
vendor_libs: create Android.mk am:
6f2ae30
am:
fcc2c62
* commit '
fcc2c62c5e43c7f31cbc3f3d77f42d2ff6873323':
vendor_libs: create Android.mk
Change-Id: I7dbfa574efbc652c359f104f167b0c7ac1a1e1ee
Cristian Iorga [Wed, 20 Apr 2016 20:52:55 +0000 (20:52 +0000)]
vendor_libs: create Android.mk
am:
6f2ae30
* commit '
6f2ae3021d3487ef00dd76f9bfb8ace8b7069b7d':
vendor_libs: create Android.mk
Change-Id: I4e07e95b8b609cbd5625968c9daa5618edf2ddd7
Cristian Iorga [Tue, 15 Mar 2016 14:33:08 +0000 (16:33 +0200)]
vendor_libs: create Android.mk
all-subdir-makefiles call works for only one
nested sublevels, so we need to add a default
Android.mk in order to be able to build libbt-vendor module.
BUG=
28014054
Change-Id: I7cc004d2a4dd6216a80d13c6384d9dcde328323e
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Jakub Pawlowski [Wed, 20 Apr 2016 16:03:38 +0000 (16:03 +0000)]
Merge "vendor_libs: test_vendor_lib: fix build" am:
67a29d6
am:
434889f
* commit '
434889fbc8c165c76048e832540cd22245bc76ba':
vendor_libs: test_vendor_lib: fix build
Change-Id: I95f82d9aa2d1fba852aa7ba0e065ab8b87f57d73
Cristian Iorga [Wed, 20 Apr 2016 16:00:24 +0000 (16:00 +0000)]
Merge "vendor_libs: test_vendor_lib: fix build"
am:
67a29d6
* commit '
67a29d6259335cd12f6eb7f6daaec1785ed68d03':
vendor_libs: test_vendor_lib: fix build
Change-Id: I21eef55cf5f3af64de9b0eb44df67b9ba300a683
Jakub Pawlowski [Wed, 20 Apr 2016 15:51:39 +0000 (15:51 +0000)]
Merge "vendor_libs: test_vendor_lib: fix build"
Andreas Gampe [Wed, 20 Apr 2016 05:35:42 +0000 (22:35 -0700)]
BT: Remove double definition
Mistake in merging.
Change-Id: If1db032a5320b3756ff8455c0c7b8ca9649bb707
Ajay Panicker [Wed, 20 Apr 2016 02:39:03 +0000 (19:39 -0700)]
resolve merge conflicts of
c7087d2 to nyc-dev-plus-aosp
Change-Id: I3181c8d053aaac5563a9f87fdc904bf087d3adf5
Ajay Panicker [Tue, 19 Apr 2016 21:49:47 +0000 (21:49 +0000)]
Add guest mode functionality (2/4) am:
7b266be
am:
88c5489
* commit '
88c548971df3b09389e7e586a4b74efc1a9d0e55':
Add guest mode functionality (2/4)
Change-Id: I51c5f4b9a3d7a59d663c4fda7e3c12119716bb66
Ajay Panicker [Tue, 19 Apr 2016 21:45:56 +0000 (21:45 +0000)]
Add guest mode functionality (2/4)
am:
7b266be
* commit '
7b266be449e4f915c419199c2312eb31f70e63bc':
Add guest mode functionality (2/4)
Change-Id: I68b38a608df104203ce9007121d3d085bede81b0
Cristian Iorga [Mon, 18 Apr 2016 13:09:31 +0000 (16:09 +0300)]
vendor_libs: test_vendor_lib: fix build
Change-Id: I1ba531c5289adea3fa5d6f9e0f68cf241a127219
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Ajay Panicker [Fri, 18 Mar 2016 00:09:24 +0000 (17:09 -0700)]
Add guest mode functionality (2/5)
Add a flag to enable() to start Bluetooth in restricted
mode. In restricted mode, all devices that are paired during
restricted mode are deleted upon leaving restricted mode.
Right now restricted mode is only entered while a guest
user is active.
Bug:
27410683
Change-Id: I8f23d28ef0aa3a8df13d469c73005c8e1b894d19
Ajay Panicker [Fri, 18 Mar 2016 00:09:24 +0000 (17:09 -0700)]
Add guest mode functionality (2/4)
Add a flag to enable() to start Bluetooth in restricted
mode. In restricted mode, all devices that are paired during
restricted mode are deleted upon leaving restricted mode.
Right now restricted mode is only entered while a guest
user is active.
Bug:
27410683
Change-Id: I19ff91d1d7fb8c60230fee7a05d32574b5b2aeda
Jakub Pawlowski [Mon, 18 Apr 2016 17:46:59 +0000 (17:46 +0000)]
Use base from libchrome am:
9f19410
am:
5f23b6f
* commit '
5f23b6fa7180f71b7aad728aa87840c619e1204e':
Use base from libchrome
Change-Id: I453e5395919fc3235c80b98e3c21425fd4b3dd78
Jakub Pawlowski [Mon, 18 Apr 2016 17:41:41 +0000 (17:41 +0000)]
Use base from libchrome
am:
9f19410
* commit '
9f19410236243d5f631582f4978df27771ff03fb':
Use base from libchrome
Change-Id: I047ce07c58ba805721f6d4895fe795b520dd7fee
Jakub Pawlowski [Mon, 18 Apr 2016 17:00:26 +0000 (10:00 -0700)]
Use base from libchrome
Change-Id: I57230618ef8653a168d69f871f88714ab339408a
Cristian Iorga [Mon, 18 Apr 2016 16:32:18 +0000 (16:32 +0000)]
Fix Linux libbt-vendor build am:
8d79346
am:
c7d0e75
* commit '
c7d0e75c97f7f18f198ec2f1f3def46ad6629412':
Fix Linux libbt-vendor build
Change-Id: Ib677d1d9afa49629f45cc820023c35734e1c7af8
Cristian Iorga [Mon, 18 Apr 2016 16:27:10 +0000 (16:27 +0000)]
Fix Linux libbt-vendor build
am:
8d79346
* commit '
8d793462d253ccb9ce619074b37f47a968fa8612':
Fix Linux libbt-vendor build
Change-Id: I501e221f8d25ee038814ccab53ef33dc33dc115d
Cristian Iorga [Wed, 30 Mar 2016 17:14:36 +0000 (20:14 +0300)]
Fix Linux libbt-vendor build
Fix enumeration values not explicitly handled in switch;
Fix the undefined reference to functions from libosi.
Change-Id: I64ab3d57d1c4879ad47ae1a03f8996287877535d
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Sharvil Nanavati [Fri, 15 Apr 2016 21:42:39 +0000 (21:42 +0000)]
Delete unused JV code
am:
17a1dfb
* commit '
17a1dfbadd39101faf713b2cd03a3428bda5e8da':
Delete unused JV code
Change-Id: I7205de534c2e684da70e71b2b620993d9d106c73
Sharvil Nanavati [Wed, 6 Apr 2016 21:46:49 +0000 (14:46 -0700)]
Delete unused JV code
Bug:
28068134
Change-Id: I16d017ef90269a435b8f66a58ed06d2fc89d407f
AnubhavGupta [Fri, 15 Apr 2016 21:00:47 +0000 (21:00 +0000)]
Merge "AVRCP: Update sdp record correctly for CT or TG." into nyc-dev
am:
1af9215
* commit '
1af921526690372da012fe9d9775626b07fa4452':
AVRCP: Update sdp record correctly for CT or TG.
Change-Id: Ice84045d0aae6e7ea9f1fd9cd6cf48ad1b3a20a3
Sanket Agarwal [Fri, 15 Apr 2016 20:50:44 +0000 (20:50 +0000)]
Merge "AVRCP: Update sdp record correctly for CT or TG." into nyc-dev
Sanket Agarwal [Fri, 15 Apr 2016 20:37:49 +0000 (20:37 +0000)]
Merge "Allow A2DP SNK audio track focus gain interface." into nyc-dev
am:
372e4d4
* commit '
372e4d4120a547f5b9d3a5db0f12622a8cfad5c5':
Allow A2DP SNK audio track focus gain interface.
Change-Id: Id82893b4f5969a9c759f20fc8dcf6697361ceea0
Sanket Agarwal [Fri, 15 Apr 2016 20:23:49 +0000 (20:23 +0000)]
Merge "Allow A2DP SNK audio track focus gain interface." into nyc-dev
Sanket Agarwal [Fri, 15 Apr 2016 20:10:45 +0000 (20:10 +0000)]
Allow A2DP SNK audio track focus gain interface. am:
501d671
am:
6c596f7
* commit '
6c596f743ec6cee290e1ea4d53139b546e0771fb':
Allow A2DP SNK audio track focus gain interface.
Change-Id: I29cec10eb809fa6bfc19d8d20b83c954eb5f1902
Sanket Agarwal [Fri, 15 Apr 2016 20:07:27 +0000 (20:07 +0000)]
Allow A2DP SNK audio track focus gain interface.
am:
501d671
* commit '
501d67199bfc5bf9c2d2a32f6eac5600320795fd':
Allow A2DP SNK audio track focus gain interface.
Change-Id: I62bc0064c9756d1bf615d8a795b3b520d333246e
Jakub Pawlowski [Fri, 15 Apr 2016 18:57:05 +0000 (18:57 +0000)]
Fix LE central device not being able to disconnect
am:
5b53ab9
* commit '
5b53ab9f5d2144f4d6c0a456f1781e89ec598fe2':
Fix LE central device not being able to disconnect
Change-Id: I98c71c9d5ad7bfcd65054f08f23e153c83da2816
Jakub Pawlowski [Fri, 15 Apr 2016 18:56:35 +0000 (18:56 +0000)]
Fix LE central device not being able to disconnect am:
6f74d76
am:
30acd82
* commit '
30acd82350466e073429fcf4f8a378178e6378e0':
Fix LE central device not being able to disconnect
Change-Id: I060d1b48bcef1430ba6c6816ea1cec62adc38c81
Jakub Pawlowski [Fri, 15 Apr 2016 18:53:10 +0000 (18:53 +0000)]
Fix LE central device not being able to disconnect
am:
6f74d76
* commit '
6f74d76a700e79217b6bba0a40860ba19fe06b3f':
Fix LE central device not being able to disconnect
Change-Id: I2179ef536d3a849f912665abc376b517e886dc67
Sanket Agarwal [Fri, 8 Apr 2016 18:26:04 +0000 (11:26 -0700)]
Allow A2DP SNK audio track focus gain interface.
In order to duck music we need to adjust the gain of the audio track
handled by A2DP SNK. Since SNK is implemented in native we need to add
interface to adjust the gain.
Bug: b/
28065071
Change-Id: I60634cfadb502e276596bcb3aafc62ef81d9023a
Jakub Pawlowski [Thu, 14 Apr 2016 10:06:54 +0000 (03:06 -0700)]
Fix LE central device not being able to disconnect
This fixes issue introduced in
https://android-review.googlesource.com/#/c/202278
Bug:
28211048
Change-Id: I08e62149358f1c1fc1759a4ca9eb375cb0ad8230
AnubhavGupta [Tue, 22 Mar 2016 18:03:33 +0000 (23:33 +0530)]
AVRCP: Update sdp record correctly for CT or TG.
-Issuses: SDP records are faulty
- AVRCP versions are faulty
- Nexus configuration shows browsing supported
- Both Cat-1 and Cat-2 is supported for Nexus CT
-Solution
- pass sdp version as parameter
- update sdp records for avrcp controller in case of client
profiles being enabled
- BTA_AV_FEAT_BROWSE flag was incorrecly set during AV registration
causing AVRCP TG version to upgrade to 1.4 even though browsing
feature is not supported.
- Use AVRC_CTLR_INCLUDED feature flag instead of AVRC_ADV_CTRL_INCLUDED
for guarding Avrcp controller code in build/parse apis for
command/response
- update categories supported for CT properly for mobile phone config
Bug: b/
28149547
Change-Id: I3ff4082453a2624a72d8f152d75af83a8efb4937
Jakub Pawlowski [Thu, 14 Apr 2016 10:06:54 +0000 (03:06 -0700)]
Fix LE central device not being able to disconnect
This fixes issue introduced in
https://android-review.googlesource.com/#/c/202278
Bug:
28211048
Change-Id: I08e62149358f1c1fc1759a4ca9eb375cb0ad8230
Sanket Agarwal [Fri, 8 Apr 2016 18:26:04 +0000 (11:26 -0700)]
Allow A2DP SNK audio track focus gain interface.
In order to duck music we need to adjust the gain of the audio track
handled by A2DP SNK. Since SNK is implemented in native we need to add
interface to adjust the gain.
Bug: b/
28065071
Change-Id: I60634cfadb502e276596bcb3aafc62ef81d9023a
AnubhavGupta [Fri, 15 Apr 2016 18:08:33 +0000 (18:08 +0000)]
AVRCP: Update sdp record correctly for CT or TG. am:
a58d7fe
am:
31f54d3
* commit '
31f54d343d0f2c9c4a80a7bddf9870543862a594':
AVRCP: Update sdp record correctly for CT or TG.
Change-Id: Ib142b6c749c5aa92e7207b1ae61a632dd8057525
AnubhavGupta [Fri, 15 Apr 2016 18:05:29 +0000 (18:05 +0000)]
AVRCP: Update sdp record correctly for CT or TG.
am:
a58d7fe
* commit '
a58d7fe1cd90d48cea8924a4f2dcaa91e65ff629':
AVRCP: Update sdp record correctly for CT or TG.
Change-Id: I02f0ec4c009170bf2f76f750dfc1dcaea6b411c8
AnubhavGupta [Tue, 22 Mar 2016 18:03:33 +0000 (23:33 +0530)]
AVRCP: Update sdp record correctly for CT or TG.
-Issuses: SDP records are faulty
- AVRCP versions are faulty
- Nexus configuration shows browsing supported
- Both Cat-1 and Cat-2 is supported for Nexus CT
-Solution
- pass sdp version as parameter
- update sdp records for avrcp controller in case of client
profiles being enabled
- BTA_AV_FEAT_BROWSE flag was incorrecly set during AV registration
causing AVRCP TG version to upgrade to 1.4 even though browsing
feature is not supported.
- Use AVRC_CTLR_INCLUDED feature flag instead of AVRC_ADV_CTRL_INCLUDED
for guarding Avrcp controller code in build/parse apis for
command/response
- update categories supported for CT properly for mobile phone config
Bug: b/
28149547
Change-Id: I3ff4082453a2624a72d8f152d75af83a8efb4937
Pavlin Radoslavov [Fri, 15 Apr 2016 16:55:29 +0000 (16:55 +0000)]
Removed unused functions
am:
1e7ad16
* commit '
1e7ad16b752c4965d113d2e8b825a8a1d8c8827a':
Removed unused functions
Change-Id: I38bdee424e7e69a0d6143c1397d73ded561c4abb
Cristian Iorga [Fri, 15 Apr 2016 15:07:24 +0000 (15:07 +0000)]
vendor_libs: linux: Fix build am:
2c3ce4a
am:
c5e026c
* commit '
c5e026c3deae9877b508b4bcea1db688fdf7b93d':
vendor_libs: linux: Fix build
Change-Id: Ie55c93cc55064496cfec03b46f6fc9d235d3a1e9
Cristian Iorga [Fri, 15 Apr 2016 15:04:22 +0000 (15:04 +0000)]
vendor_libs: linux: Fix build
am:
2c3ce4a
* commit '
2c3ce4ab59a0026e790af078286f82c6975524b9':
vendor_libs: linux: Fix build
Change-Id: I29286f779abbb456e9f4329a7ce71076b99bbe2a
Cristian Iorga [Thu, 14 Apr 2016 08:00:28 +0000 (11:00 +0300)]
vendor_libs: linux: Fix build
LOG_DEBUG, LOG_VERBOSE definition changed in libosi.
This triggers:
"error: use of undeclared identifier 'true'" at
build time. Fixed by the inclusion of stdbool.h.
Change-Id: Ie2ed0d6b07bc28c26669b19a2584ea248e2782a9
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Pavlin Radoslavov [Thu, 7 Apr 2016 18:47:48 +0000 (11:47 -0700)]
Removed unused functions
Removed unused functions and defines that are not needed:
- l2c_bcst_msg()
- GAP_ConnBTWrite()
- gap_proc_btu_event()
- AVDT_WriteDataReq()
- L2CAP_BCST_MIN_OFFSET
- L2CAP_BCST_OVERHEAD
- AVDT_MAX_MEDIA_SIZE
- LOG_NDDEBUG in btif/src/bluetooth.c
Bug:
28068134
Change-Id: If0edda2bf86caf83027db2c897537c82a0d80667
Treehugger Robot [Thu, 14 Apr 2016 20:42:10 +0000 (20:42 +0000)]
Merge "HID: Fix regression caused by commit "
3a2c2d61"" am:
153d3e4
am:
7a0f573
* commit '
7a0f573660989a94e264f56473eafaafc5be5ef2':
HID: Fix regression caused by commit "
3a2c2d61"
Change-Id: Ie9ae70e7b291050deacb1ef6df4b6109d556de0f
Hemant Gupta [Thu, 14 Apr 2016 20:38:39 +0000 (20:38 +0000)]
Merge "HID: Fix regression caused by commit "
3a2c2d61""
am:
153d3e4
* commit '
153d3e448d9797cc1b9841b9a060bed308d5190f':
HID: Fix regression caused by commit "
3a2c2d61"
Change-Id: I264c7ff85d33e03b0edb68075118657e39e69b86
Treehugger Robot [Thu, 14 Apr 2016 20:27:53 +0000 (20:27 +0000)]
Merge "HID: Fix regression caused by commit "
3a2c2d61""
Christopher Wiley [Thu, 14 Apr 2016 18:45:11 +0000 (18:45 +0000)]
Allow unused private field am:
bac99a1
am:
5e9669b
* commit '
5e9669b709d24dc51712930b9302e8bbce47ba57':
Allow unused private field
Change-Id: Ie7d408783656cfb71905a543ee9c51d8d1d9f376
Christopher Wiley [Thu, 14 Apr 2016 18:41:56 +0000 (18:41 +0000)]
Allow unused private field
am:
bac99a1
* commit '
bac99a18b378364b07c7f82ebf173e2d20fbd900':
Allow unused private field
Change-Id: I823105282a8c8870a14faebb5371e6755c760024
Christopher Wiley [Thu, 14 Apr 2016 17:32:56 +0000 (10:32 -0700)]
Allow unused private field
This field is unused when we build unittests for OSX.
Bug:
28117776
Test: Compiles
Change-Id: I6add6946896a8cc2838309e6188812d4c7c497cb
Andre Eisenbach [Thu, 14 Apr 2016 07:18:45 +0000 (07:18 +0000)]
Ensure PIN code dialog is shown after remote name request am:
f8e3baa
am:
63da098
* commit '
63da09852b01120da19b5d1ca3790b7f21a3c39f':
Ensure PIN code dialog is shown after remote name request
Change-Id: I738e3936bc98cd84a9b9b127f43fb319c84d1348
Andre Eisenbach [Thu, 14 Apr 2016 07:18:45 +0000 (07:18 +0000)]
Move autopair blacklist to interop database am:
7ee02bd
am:
2aea2e5
* commit '
2aea2e563058a2388a16b0a8980bd763a6f47de6':
Move autopair blacklist to interop database
Change-Id: I4aeb2d75a4eae19ebc56736acb2dbb5bd18e2284
Andre Eisenbach [Thu, 14 Apr 2016 07:15:46 +0000 (07:15 +0000)]
Ensure PIN code dialog is shown after remote name request
am:
f8e3baa
* commit '
f8e3baa34e2c3fe021605b2a23b902b44eafc115':
Ensure PIN code dialog is shown after remote name request
Change-Id: Ibb26c522600071833e17306339e5a6f607a25892
Andre Eisenbach [Thu, 14 Apr 2016 07:15:46 +0000 (07:15 +0000)]
Ensure PIN code dialog is shown after remote name request
am:
c8a78e4
* commit '
c8a78e445a8f789a1fc682acd144053363f04c93':
Ensure PIN code dialog is shown after remote name request
Change-Id: Ie764019620f7b93a43c6867ff80f732454cb3d32
Andre Eisenbach [Thu, 14 Apr 2016 07:15:46 +0000 (07:15 +0000)]
Move autopair blacklist to interop database
am:
7ee02bd
* commit '
7ee02bdb617c7f2c27d03a21112f485ec36371b4':
Move autopair blacklist to interop database
Change-Id: Ia02c9b9af114be9aad18f1640dd839e4f462ebc6
Andre Eisenbach [Thu, 14 Apr 2016 07:15:46 +0000 (07:15 +0000)]
Move autopair blacklist to interop database
am:
9567384
* commit '
95673843582fccf026d8af7592428f9b864f52fd':
Move autopair blacklist to interop database
Change-Id: Ic8d7aa6f7f3745da5734048f120e3594fc4a00a5
Andre Eisenbach [Wed, 13 Apr 2016 16:44:00 +0000 (09:44 -0700)]
Ensure PIN code dialog is shown after remote name request
If pairing is locally initiated and results in a remote name request
being performed before the PIN code is requested, then the PIN code
dialog will not be shown correctly.
This patch removes the check for locally initated pairing to ensure the
dialog is shown in all cases.
Bug:
27347017
Change-Id: I607c1c071af502fb2990b14cce676590e577b4c2
Andre Eisenbach [Mon, 11 Apr 2016 21:50:41 +0000 (14:50 -0700)]
Move autopair blacklist to interop database
Blacklist by partial name etc. was not working and had no effect; all
BDAs in the config file start with 00:, which is implausible at best, so
deleted...
Added new mechanism to blacklist by BDA only initially and added Subaru
car kit to blacklist.
Bug:
27347017
Change-Id: Ie2941cb1ab663b5444b02c44f85032f13be4ab46
Andre Eisenbach [Wed, 13 Apr 2016 16:44:00 +0000 (09:44 -0700)]
Ensure PIN code dialog is shown after remote name request
If pairing is locally initiated and results in a remote name request
being performed before the PIN code is requested, then the PIN code
dialog will not be shown correctly.
This patch removes the check for locally initated pairing to ensure the
dialog is shown in all cases.
Bug:
27347017
Change-Id: I607c1c071af502fb2990b14cce676590e577b4c2
Marie Janssen [Wed, 13 Apr 2016 22:50:59 +0000 (22:50 +0000)]
btif: add count of devices loaded on startup am:
bcfdd0a
am:
ec8f643
* commit '
ec8f643b2d1691e21c4004671d25b5606c1d47af':
btif: add count of devices loaded on startup
Change-Id: Ic6ba0a53f0abd711cae1e5b1323e6f3ea3ed7a0f
Marie Janssen [Wed, 13 Apr 2016 22:47:21 +0000 (22:47 +0000)]
btif: add count of devices loaded on startup
am:
bcfdd0a
* commit '
bcfdd0ab24357c5dd842540e6c0e8f34ba7aac11':
btif: add count of devices loaded on startup
Change-Id: If7a6fa7e722886f82069dbaafd0d0e46eba9a963
Marie Janssen [Wed, 13 Apr 2016 19:43:03 +0000 (12:43 -0700)]
btif: add count of devices loaded on startup
Report devices initially loaded from the config file.
Also removes the config mutex from btif_debug_config_dump as the config
is not modified.
Bug:
27354612
Change-Id: I25033ce28744051412f0d2bd554f0651e807ba7c
Sharvil Nanavati [Wed, 13 Apr 2016 19:43:40 +0000 (19:43 +0000)]
Merge "Fix use of uninitialized value in btm_acl_update_busy_level" am:
50e7a19
am:
5a7db1d
* commit '
5a7db1d00f640e127f14c240ff98faddbcd5c2f8':
Fix use of uninitialized value in btm_acl_update_busy_level
Change-Id: Iff2e2f364aa6f1a5b9665a82e9c43de8f90ecb6c
Sharvil Nanavati [Wed, 13 Apr 2016 19:43:40 +0000 (19:43 +0000)]
Merge "Fix use of uninitialized value in BTA_PanSetRole" am:
98178e4
am:
07c7006
* commit '
07c700627ac38b275aaf7f6599f5a14de3e39d0e':
Fix use of uninitialized value in BTA_PanSetRole
Change-Id: I506da1f30da3f0eef981deea2cb34c21ee9b16af
Andre Eisenbach [Mon, 11 Apr 2016 21:50:41 +0000 (14:50 -0700)]
Move autopair blacklist to interop database
Blacklist by partial name etc. was not working and had no effect; all
BDAs in the config file start with 00:, which is implausible at best, so
deleted...
Added new mechanism to blacklist by BDA only initially and added Subaru
car kit to blacklist.
Bug:
27347017
Change-Id: Ie2941cb1ab663b5444b02c44f85032f13be4ab46
Sharvil Nanavati [Wed, 13 Apr 2016 18:59:09 +0000 (18:59 +0000)]
Merge "Fix use of uninitialized value in btm_acl_update_busy_level"
am:
50e7a19
* commit '
50e7a19cbb09d62282bc109cf269b7d3a3fb9c0a':
Fix use of uninitialized value in btm_acl_update_busy_level
Change-Id: I403886f7ef003c54bc41ad2b2328d0f2862e2418
Sharvil Nanavati [Wed, 13 Apr 2016 18:59:08 +0000 (18:59 +0000)]
Merge "Fix use of uninitialized value in BTA_PanSetRole"
am:
98178e4
* commit '
98178e4d233a828f3f4b68683ce89b8560ecb34d':
Fix use of uninitialized value in BTA_PanSetRole
Change-Id: Ibe66e6d6a450c6c76b31efc0252ebb8d238c2116
Sharvil Nanavati [Wed, 13 Apr 2016 18:53:16 +0000 (18:53 +0000)]
Merge "Fix use of uninitialized value in btm_acl_update_busy_level"
Sharvil Nanavati [Wed, 13 Apr 2016 18:53:12 +0000 (18:53 +0000)]
Merge "Fix use of uninitialized value in BTA_PanSetRole"
Sharvil Nanavati [Mon, 11 Apr 2016 00:29:11 +0000 (17:29 -0700)]
Fix use of uninitialized value in btm_acl_update_busy_level
Caught by valgrind:
Thread 7 bt_jni_workqueue:
Conditional jump or move depends on uninitialised value(s)
at 0x5682870: btif_dm_upstreams_evt (btif_dm.c:1800)
by 0x56817EF: btif_context_switched (btif_core.c:180)
by 0x56817EF: bt_jni_msg_ready (btif_core.c:290)
by 0x571D1D7: work_queue_read_cb (thread.c:233)
by 0x571C1F9: run_reactor (reactor.c:275)
by 0x571CF3D: run_thread (thread.c:206)
by 0x4A5B7B3: __pthread_start(void*) (in /system/lib/libc.so)
Uninitialised value was created by a stack allocation
at 0x56D9CC6: btm_acl_update_busy_level (btm_acl.c:503)
Bug:
28113318
Change-Id: I21ffa2f6c48d3bb96dcdc71fee6ab74634e57333
Hemant Gupta [Wed, 13 Apr 2016 11:12:18 +0000 (16:42 +0530)]
HID: Fix regression caused by commit "
3a2c2d61"
uhid_event function returned 0 in normal case and with below
commit polling thread was being exited resulting in user space
not able to read the events sent by uhid kernel driver leading
to IOT issues with HID devices using the vendor hid usb drivers.
Eg: Apple Magic Mouse scroll functionality was not working as
for normal functionality of Apple Magic mouse, output report
needs to be sent to hid device, which was not being sent with
current implemenation.
commit
3a2c2d61f4c8769ea9c1615208a6daf2fa162084
Author: Myles Watson <mylesgw@google.com>
Date: Tue Nov 10 14:35:57 2015 -0800
Retry HID Polling when EINTR is returned
While I'm here
- use __func__ consistently in btif_hh_poll_event_thread.
- remove braces around a single line
BUG:
24647083
Change-Id: I80b99ff0d3ba6336f5ab7a517269fdf63df59b37
Signed-off-by: Myles Watson <mylesgw@google.com>
Change-Id: If1f69c8d024fd7d03e2d79f19b962653fe2dd8b9
Treehugger Robot [Tue, 12 Apr 2016 22:12:15 +0000 (22:12 +0000)]
Merge "Pull in libmedia\'s exported headers in libbtif" am:
cac1eef
am:
6591b0d
* commit '
6591b0d6a2a17ee47d1aa30e86bd51d41fff3cea':
Pull in libmedia's exported headers in libbtif
Change-Id: I40ad74e4466b4879633c033c4469ce23797f1a1f
Christopher Wiley [Tue, 12 Apr 2016 21:27:48 +0000 (21:27 +0000)]
Merge "Pull in libmedia\'s exported headers in libbtif"
am:
cac1eef
* commit '
cac1eefd3494ef8f8521609b751283486499e2bd':
Pull in libmedia's exported headers in libbtif
Change-Id: Ifeaded82445f0804097dd41017e0e7693745a185
Treehugger Robot [Tue, 12 Apr 2016 21:14:33 +0000 (21:14 +0000)]
Merge "Pull in libmedia's exported headers in libbtif"
Sharvil Nanavati [Mon, 11 Apr 2016 00:15:29 +0000 (17:15 -0700)]
Fix use of uninitialized value in BTA_PanSetRole
Caught by valgrind:
Conditional jump or move depends on uninitialised value(s)
at 0x57616E8: PAN_SetRole (pan_api.c:170)
by 0x56C0193: bta_pan_set_role (bta_pan_act.c:370)
by 0x56BFD65: bta_pan_hdl_event (bta_pan_main.c:387)
by 0x56D24DD: bta_sys_event (bta_sys_main.c:495)
by 0x5777029: run_reactor (reactor.c:275)
by 0x5777D6D: run_thread (thread.c:206)
by 0x49A77B3: __pthread_start(void*) (in /system/lib/libc.so)
Uninitialised value was created by a heap allocation
at 0x495883C: malloc (in /system/lib/valgrind/vgpreload_memcheck-arm-linux.so)
by 0x5774857: osi_malloc (allocator.c:67)
by 0x56C07A9: BTA_PanSetRole (bta_pan_api.c:107)
by 0x56FBF31: btpan_enable (btif_pan.c:226)
by 0x56DB3AB: btif_enable_bluetooth_evt (btif_core.c:524)
by 0x56DE3EB: btif_dm_upstreams_evt (btif_dm.c:1742)
by 0x56DC60F: btif_context_switched (btif_core.c:180)
by 0x56DC60F: bt_jni_msg_ready (btif_core.c:290)
by 0x5778007: work_queue_read_cb (thread.c:233)
by 0x5777029: run_reactor (reactor.c:275)
by 0x5777D6D: run_thread (thread.c:206)
by 0x49A77B3: __pthread_start(void*) (in /system/lib/libc.so)
Bug:
28113318
Change-Id: Icdba2b7a557254d29f8c3a62c6d1a7aafa4fdde4
Pavlin Radoslavov [Tue, 12 Apr 2016 20:56:00 +0000 (20:56 +0000)]
Removed unused functions am:
8e7323e
am:
2e2d6b6
* commit '
2e2d6b655094aa05d4f04d17edb78c7e736031f5':
Removed unused functions
Change-Id: I8c9fff9b4121afb82fb1e1ab832408101ffb9904
Pavlin Radoslavov [Tue, 12 Apr 2016 20:49:59 +0000 (20:49 +0000)]
Removed unused functions
am:
8e7323e
* commit '
8e7323ea75b8755b6d372115f0c8b1aa7789e96b':
Removed unused functions
Change-Id: I03714338200aa89c48abda1e9af4ae0422bb3112
Pavlin Radoslavov [Thu, 7 Apr 2016 18:47:48 +0000 (11:47 -0700)]
Removed unused functions
Removed unused functions and defines that are not needed:
- l2c_bcst_msg()
- GAP_ConnBTWrite()
- gap_proc_btu_event()
- AVDT_WriteDataReq()
- L2CAP_BCST_MIN_OFFSET
- L2CAP_BCST_OVERHEAD
- AVDT_MAX_MEDIA_SIZE
- LOG_NDDEBUG in btif/src/bluetooth.c
Bug:
28068134
Change-Id: If0edda2bf86caf83027db2c897537c82a0d80667
Christopher Wiley [Tue, 12 Apr 2016 20:31:05 +0000 (20:31 +0000)]
Fix ambiguous base::TimeDelta reference am:
33bd1b4
am:
58d7189
* commit '
58d71890def3b2150c39e8a8dc95f98689a52867':
Fix ambiguous base::TimeDelta reference
Change-Id: I3d80c30471006c7fd4148bbd316ba32d215825fa
Christopher Wiley [Tue, 12 Apr 2016 20:24:47 +0000 (20:24 +0000)]
Fix ambiguous base::TimeDelta reference
am:
33bd1b4
* commit '
33bd1b43bdc88e4ba9018004cc67815915f56615':
Fix ambiguous base::TimeDelta reference
Change-Id: I784db9edf02854f6cacf3017121df6ab177f1681
Christopher Wiley [Mon, 11 Apr 2016 22:14:23 +0000 (15:14 -0700)]
Pull in libmedia's exported headers in libbtif
Do this by listing libmedia as a shared library linked by libbtif.
We won't actually be able to link against libmedia because static
libraries don't work like that, but surrounding logic about headers
is triggered.
Bug:
27804373
Test: libbtif compiles in the presence of a new exported header path
in libmedia.
Change-Id: Ic1e776966daaf70b7b9ae6ea99af89bc9a0b3885
Christopher Wiley [Mon, 11 Apr 2016 22:18:14 +0000 (15:18 -0700)]
Fix ambiguous base::TimeDelta reference
base::TimeDelta cannot be resolved when both libbase's
android::base namespace and libchrome's base:: namespace
are included via transitive header dependencies.
Bug:
27804373
Test: Compiles.
Change-Id: I9854c92763728fb85ad21183f37c94a4d7bd61a5
Jakub Pawlowski [Tue, 12 Apr 2016 19:29:04 +0000 (19:29 +0000)]
Trigger a compilation error when LOG_TAG is not provided am:
92f0ed3
am:
6e986ce
* commit '
6e986ce9841ed50ebe22b23b89813af56af42341':
Trigger a compilation error when LOG_TAG is not provided
Change-Id: Iada679a6a10cfe2efb5855f9fc9f8af181dcd30b
Jakub Pawlowski [Tue, 12 Apr 2016 19:23:07 +0000 (19:23 +0000)]
Trigger a compilation error when LOG_TAG is not provided
am:
92f0ed3
* commit '
92f0ed330a0ae2e52f5a0538041cc54762781ad0':
Trigger a compilation error when LOG_TAG is not provided
Change-Id: I50af14e4cb8cc1e43400724de2fc3142442d3498
Bluetooth Build Test [Tue, 12 Apr 2016 18:53:35 +0000 (18:53 +0000)]
Linux build fix am:
b4a42e7
am:
17a4581
* commit '
17a45812cc4a29293333ae8d50271e7234d0ef56':
Linux build fix
Change-Id: I77747675fa8100f41d858fbd98e48bdc1fe4d7e7