OSDN Git Service
Cristian Iorga [Wed, 20 Apr 2016 20:56:19 +0000 (20:56 +0000)]
vendor_libs: create Android.mk am:
6f2ae30
am:
fcc2c62
* commit '
fcc2c62c5e43c7f31cbc3f3d77f42d2ff6873323':
vendor_libs: create Android.mk
Change-Id: I1d9f50f2f31f00bb9ee389299321aad8b8a4eca6
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:28 +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: I2227d9cacbbd7e2897d968fd6f78385187b4c609
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"
Ajay Panicker [Tue, 19 Apr 2016 21:49:26 +0000 (21:49 +0000)]
Add guest mode functionality (2/4) am:
7b266be
am:
88c5489
* commit '
88c548971df3b09389e7e586a4b74efc1a9d0e55':
Add guest mode functionality (2/4)
Change-Id: I72664880fa1d2f79922b51447a94051392c8653b
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/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:49 +0000 (17:46 +0000)]
Use base from libchrome am:
9f19410
am:
5f23b6f
* commit '
5f23b6fa7180f71b7aad728aa87840c619e1204e':
Use base from libchrome
Change-Id: I59485278079f17d7720a33e55b3cdc2f4cc060dc
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: I9198a21b05e7dc9f8792173049069e5cf57c7811
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>
Sanket Agarwal [Fri, 15 Apr 2016 20:10:23 +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: Icdbe02f75f77e4af5014a40974cedcf1949cd526
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: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: I1209825e9eeeb2925372bdf49507addad1de5e14
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 [Fri, 15 Apr 2016 18:08:34 +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: I943bf38618e74ca1214726303d3d3d5844a3c9c0
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
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: I05cd040314f1928291d0420106ef9f64e15944ef
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>
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: Ie0f710fe50e9ae3984fca9ae24438703f33b52b8
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:10 +0000 (18:45 +0000)]
Allow unused private field am:
bac99a1
am:
5e9669b
* commit '
5e9669b709d24dc51712930b9302e8bbce47ba57':
Allow unused private field
Change-Id: Ibcfddd1a20c8dd2d90786bedb1d50fb7a741f6a1
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: I8d5ad97edfc1acc8d1d299940c2531d7d7e142d9
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: I5fa6d8ced24c6c13e779fe48564b7f94c258ddde
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)]
Move autopair blacklist to interop database
am:
7ee02bd
* commit '
7ee02bdb617c7f2c27d03a21112f485ec36371b4':
Move autopair blacklist to interop database
Change-Id: Ia02c9b9af114be9aad18f1640dd839e4f462ebc6
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
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: I029893a958de233b698a6c0d930a9073297dd2c3
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:03:16 +0000 (19:03 +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: I04d401ca09e8403b10acaa25c6e5a643b69db372
Sharvil Nanavati [Wed, 13 Apr 2016 19:03:16 +0000 (19:03 +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: Icccdac51fe9fc28aa61bb57cd20badfef861c069
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:11:47 +0000 (22:11 +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: I87d008d73dd7d575cf5bd84e53c549a0afa402dc
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:55:59 +0000 (20:55 +0000)]
Removed unused functions am:
8e7323e
am:
2e2d6b6
* commit '
2e2d6b655094aa05d4f04d17edb78c7e736031f5':
Removed unused functions
Change-Id: Idaf1c038c56f92d6edd9e44ddd4174e161d4d6b0
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: I52ddc78b5a3bb2d7e4757b2dda27bdb0db623261
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: Ica10d7da194263079d10ea97bc2a133562fe986d
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: I099aad874a957158b38370e0b342bcadec6cd175
Jakub Pawlowski [Tue, 12 Apr 2016 18:53:35 +0000 (18:53 +0000)]
Fix valgrind error am:
431885e
am:
8269b9f
* commit '
8269b9f82110599b925c6d67d6943fd6eb538d35':
Fix valgrind error
Change-Id: I3284abc2888b522a776f35b29175363cf2155266
Jakub Pawlowski [Tue, 12 Apr 2016 18:53:34 +0000 (18:53 +0000)]
Cleanup unnecessary logs am:
4529f1b
am:
0cb8bef
* commit '
0cb8bef315508d506d9ccc9101d151ee4d372ae0':
Cleanup unnecessary logs
Change-Id: I7cb090fde80f4b0c4f9ac9a897cbe024597abb20
Bluetooth Build Test [Tue, 12 Apr 2016 18:47:52 +0000 (18:47 +0000)]
Linux build fix
am:
b4a42e7
* commit '
b4a42e7b9c277cfd71a575cbdb104013855b80cd':
Linux build fix
Change-Id: Ie87160ed6279cfcd2eca2cf8dc30f489b44d15a9
Jakub Pawlowski [Tue, 12 Apr 2016 18:47:52 +0000 (18:47 +0000)]
Fix valgrind error
am:
431885e
* commit '
431885e7b6fb0ffc861571b907d3f66963333c2a':
Fix valgrind error
Change-Id: I5dd51a742a77bfc86bcfb8f269db221862d5679e
Jakub Pawlowski [Tue, 12 Apr 2016 18:47:52 +0000 (18:47 +0000)]
Cleanup unnecessary logs
am:
4529f1b
* commit '
4529f1bda41a587d03c1d68ce4e9d8ec21920045':
Cleanup unnecessary logs
Change-Id: I77086ef0cb4934be958655500e4918bd91ca0fef
Jakub Pawlowski [Mon, 11 Apr 2016 08:54:54 +0000 (01:54 -0700)]
Trigger a compilation error when LOG_TAG is not provided
When compiling for OS_GENERIC, lack of LOG_TAG causes a compilation error.
Most developement happens on Android, which compiles this without an
error. This patch triggers a compilation failure on Android when LOG_TAG is not
provided.
Bug:
28118588
Change-Id: I316aa01952fb88d77bbabb197c77e4287a3fc39b
Bluetooth Build Test [Thu, 7 Apr 2016 12:10:40 +0000 (14:10 +0200)]
Linux build fix
* add missing LOG_TAG definition
* add missing LOG_TAG inside LOG statements
* remove unnecessary includes of cutils/*.h files
* update libchrome/BUILD.gn to be on par with latest version of
library used in Android
Bug:
28094186
Change-Id: I19a07afac20789b42a070995f6aa9da68b1bb940
Jakub Pawlowski [Tue, 12 Apr 2016 13:44:52 +0000 (06:44 -0700)]
Fix valgrind error
This patch fixes following valgrind error message:
==5000== Thread 6 bt_jni_workqueue:
==5000== Conditional jump or move depends on uninitialised value(s)
==5000== at 0x4353C7:
bluetooth::LowEnergyClient::ScanResultCallback(bluetooth::hal::BluetoothGattInterface*,
bt_bdaddr_t const&, int, unsigned char*) (low_energy_client.cpp:573)
==5000== by 0x443BBB: bluetooth::hal::(anonymous
namespace)::ScanResultCallback(bt_bdaddr_t*, int, unsigned char*)
(bluetooth_gatt_interface.cpp:91)
Bug:
28113318
Change-Id: Ide82c6a7f68f6bbe427f12ca353d62f1d999d0ae
Jakub Pawlowski [Tue, 12 Apr 2016 12:50:49 +0000 (05:50 -0700)]
Cleanup unnecessary logs
Bug:
27698756
Change-Id: I30b5e4b45d4b06e0264415e85949c7bf828f28c0
Lianchao Song [Mon, 11 Apr 2016 17:19:39 +0000 (17:19 +0000)]
Do not update sco_state when no matching peer_addr is found am:
2dfcbda
am:
56cc0c3
* commit '
56cc0c361644db8d1b5c638ecd11871e38a0a1d4':
Do not update sco_state when no matching peer_addr is found
Change-Id: I4a443927d06c51eb784a472ea9eb6df8bc46d853
Lianchao Song [Mon, 11 Apr 2016 17:14:44 +0000 (17:14 +0000)]
Do not update sco_state when no matching peer_addr is found
am:
2dfcbda
* commit '
2dfcbda49f694fcf1355955c334926e8641b4dc5':
Do not update sco_state when no matching peer_addr is found
Change-Id: Ibdf55ed17a816591a2c40c549d4fc8df7e44aba9
Lianchao Song [Wed, 23 Mar 2016 03:03:19 +0000 (11:03 +0800)]
Do not update sco_state when no matching peer_addr is found
In the bta_hf_client_sco_conn_cback function, sco_state should not be set to
BTA_HF_CLIENT_SCO_SHUTDOWN_ST when no matched peer_addr found, so that it
can handle BTA_HF_CLIENT_SCO_OPEN_E event later.
Bug:
26416310
Change-Id: I4540230c792490f79e4cca24cb4b34a1c383422f
Signed-off-by: m00230717 <m00230717@notesmail.huawei.com>
Sharvil Nanavati [Wed, 6 Apr 2016 23:29:52 +0000 (23:29 +0000)]
Disable the Java subsystem when RFCOMM sockets are cleaned up am:
8b92a6d
am:
421b68c
* commit '
421b68c20676f68c632a700841c8c75d6a86e88d':
Disable the Java subsystem when RFCOMM sockets are cleaned up
Change-Id: I0a239354e287bf058828a44fdc28bdaa9d3ef740
Sharvil Nanavati [Wed, 6 Apr 2016 23:29:52 +0000 (23:29 +0000)]
Delete unused JV code am:
547a297
am:
5a3d3d4
* commit '
5a3d3d4f494beab2c76a707cd6566fb0740c51e9':
Delete unused JV code
Change-Id: Iea3f0c1308314b421b535e83f0655638ca5866e5
Sharvil Nanavati [Wed, 6 Apr 2016 23:27:05 +0000 (23:27 +0000)]
Disable the Java subsystem when RFCOMM sockets are cleaned up
am:
8b92a6d
* commit '
8b92a6dec2f559141ecc0f9564f1b91bdea72ac2':
Disable the Java subsystem when RFCOMM sockets are cleaned up
Change-Id: Idef44af7dcbad1fb5bde67d0c29cffb9d948d17d
Sharvil Nanavati [Wed, 6 Apr 2016 23:27:04 +0000 (23:27 +0000)]
Delete unused JV code
am:
547a297
* commit '
547a2972e70021724f5638165a54da36d6a06198':
Delete unused JV code
Change-Id: I2165a09dc74f8e9ec3b2f174d9aea6550f5a812f
Sharvil Nanavati [Wed, 6 Apr 2016 23:08:38 +0000 (16:08 -0700)]
Disable the Java subsystem when RFCOMM sockets are cleaned up
Change-Id: I33dfd2aa01d6f496bee151d5994872e04d25e469
Sharvil Nanavati [Wed, 6 Apr 2016 21:46:49 +0000 (14:46 -0700)]
Delete unused JV code
Change-Id: I16d017ef90269a435b8f66a58ed06d2fc89d407f
Navin Kochar [Wed, 6 Apr 2016 17:11:00 +0000 (17:11 +0000)]
Fix for issue introduced due to rebase of LE L2CAP COC am:
5e8a3d7
am:
3a3007a
* commit '
3a3007aff43970879b4e3152f1274526ccf2588d':
Fix for issue introduced due to rebase of LE L2CAP COC
Change-Id: I140f7dee94f496e834b0d3c342495aa7ec000430
Navin Kochar [Wed, 6 Apr 2016 17:08:34 +0000 (17:08 +0000)]
Fix for issue introduced due to rebase of LE L2CAP COC
am:
5e8a3d7
* commit '
5e8a3d7790e8c0e744173dfa8bb76a567160cbfa':
Fix for issue introduced due to rebase of LE L2CAP COC
Change-Id: Ie75d3f9822b63fa544d6d5dcc2df7be6369b5fd3
Navin Kochar [Fri, 18 Mar 2016 06:34:30 +0000 (12:04 +0530)]
Fix for issue introduced due to rebase of LE L2CAP COC
During
6721232 patch, some code got missed while doing manual rebase.
This patch is adding that missing code.
Change-Id: I2525908c29e3288e0ace1ee26c5f2aa6cfd59d68
Signed-off-by: Navin Kochar <navin.kochar@intel.com>
Pavlin Radoslavov [Tue, 5 Apr 2016 23:43:59 +0000 (23:43 +0000)]
Updated the A2DP statistics am:
94b6e5f
am:
69982dc
* commit '
69982dcf3da70623b68c41580b04eeca73495f06':
Updated the A2DP statistics
Change-Id: Idccac952c183df19aca21a3de2947a6ad6896544
Pavlin Radoslavov [Tue, 5 Apr 2016 23:40:37 +0000 (23:40 +0000)]
Updated the A2DP statistics
am:
94b6e5f
* commit '
94b6e5fe8e9aafb0d39059e10d0fb904bd6ed2d6':
Updated the A2DP statistics
Change-Id: I05adf404551f4448f7253e630f4f123e4001fc67
Pavlin Radoslavov [Tue, 5 Apr 2016 18:45:30 +0000 (11:45 -0700)]
Updated the A2DP statistics
* Added "Frame expected" and "Frames limited" statistics in the
bugreport about expected and limited number of frames per tick.
Also, added corresponding "Counts (expected/limited)":
A2DP State:
TxQueue:
Counts (enqueue/dequeue/readbuf) : 386 / 386 / 768
Last update time ago in ms (enqueue/dequeue/readbuf) : 12644 / 12643 / 12600
Frames expected (total/max/ave) : 2632 / 8 / 6
Frames limited (total/max/ave) : 0 / 0 / 0
Counts (expected/limited) : 382 / 0
Frames per packet (total/max/ave) : 2618 / 7 / 6
...
* Renamed "tx_queue_max_frames" to "tx_queue_max_frames_per_packet"
* Fixed the computation of actual transmitted frames:
tx_queue_total_frames, tx_queue_max_frames_per_packet
* Computed / added buffer_overruns_max_count and
buffer_underruns_average to the Protobuf stats.
Bug:
27500656
Change-Id: Id58cfb0b5de2296742c84aa0b743e0eed398f41f
Marie Janssen [Tue, 5 Apr 2016 21:12:05 +0000 (21:12 +0000)]
Fix memory leak when saving paired devices am:
4cef24d
am:
e71149e
* commit '
e71149e8957af900a2482a7dac19317a33421f06':
Fix memory leak when saving paired devices
Change-Id: I77f9f090abb8e39da86ecdf557bb306ed004d5de
Marie Janssen [Tue, 5 Apr 2016 21:08:28 +0000 (21:08 +0000)]
Fix memory leak when saving paired devices
am:
4cef24d
* commit '
4cef24d88eb14396011bf31a185d4cab9d0254aa':
Fix memory leak when saving paired devices
Change-Id: Ib345263e694a3513e582fc06466f329253ad512e
Marie Janssen [Tue, 5 Apr 2016 18:36:15 +0000 (11:36 -0700)]
Fix memory leak when saving paired devices
Followup from r.android.com/210955
Minor style fixes for osi/config also included.
Bug:
26071376
Change-Id: I26563b75a59a6f0ae074676754889cb988a69358
Marie Janssen [Mon, 4 Apr 2016 23:40:37 +0000 (23:40 +0000)]
btif: Don\'t persist remote devices to the config am:
d9ebc23
am:
117f882
* commit '
117f882307312190a5ac1c6d7be2a6b125e16cc2':
btif: Don't persist remote devices to the config
Change-Id: Ie44ac6ce57f55de279ae6ef629e22eee9b6c8998
Marie Janssen [Mon, 4 Apr 2016 23:38:07 +0000 (23:38 +0000)]
btif: Don\'t persist remote devices to the config
am:
d9ebc23
* commit '
d9ebc239abf77a1133c3456db84444ccbc8d0fdd':
btif: Don't persist remote devices to the config
Change-Id: I99663047927e2cdf5fe00c88f1e6f1cdb13cf538
Marie Janssen [Fri, 25 Mar 2016 20:37:13 +0000 (13:37 -0700)]
btif: Don't persist remote devices to the config
We don't need to persist the unpaired devices to NVRAM
so skip saving them.
This fixes a regression in a previous patch where the most recent
instead of the least recent devices would be removed, making some
devices unpairable in extremely busy environments.
Bug:
26071376
Change-Id: If7ee9d960f70c836bf08b78da5f3fc852ba60a85
Alain Vongsouvanh [Mon, 4 Apr 2016 22:01:09 +0000 (22:01 +0000)]
Bring back support for legacy bt_config.xml am:
9a58e68
am:
3c5250c
* commit '
3c5250ce8272d2e0acc0a4d46f9fba2900e12ae9':
Bring back support for legacy bt_config.xml
Change-Id: I99790e15bdbe2c0f6072fe28ef6e632e924d2c5c
Sanket Agarwal [Mon, 4 Apr 2016 21:50:56 +0000 (14:50 -0700)]
resolve merge conflicts of
cd5d41a to master
Change-Id: I6c0c97c45247a3e1eeebb9eaca222cc0472f6681
Alain Vongsouvanh [Mon, 4 Apr 2016 21:43:19 +0000 (21:43 +0000)]
Bring back support for legacy bt_config.xml
am:
9a58e68
* commit '
9a58e68a98fbe1680535a7e7641de91e89273ad8':
Bring back support for legacy bt_config.xml
Change-Id: Ic0c4694008ec1f9c37818b033cdba97047769f33
Sanket Agarwal [Mon, 4 Apr 2016 21:38:40 +0000 (21:38 +0000)]
A2DP_SINK: initialize track handle to null
am:
a9d2a6b
* commit '
a9d2a6ba64ab61e13b9f6db1f282ab1e5fff6ef3':
A2DP_SINK: initialize track handle to null
Change-Id: Ia3aed429db0fbfc8cfeb6058c84741fe8ba4e8d1
Alain Vongsouvanh [Wed, 30 Mar 2016 00:33:55 +0000 (17:33 -0700)]
Bring back support for legacy bt_config.xml
If a device migrates directly from L or earlier to a version using this
new implementation, all bt_config will be lost, requiring to repair to
the devices.
Change-Id: Ifdca0d8cad8efaa9f503ca40ac0725547a06f15c