OSDN Git Service
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
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
Sanket Agarwal [Wed, 30 Mar 2016 13:31:16 +0000 (19:01 +0530)]
A2DP_SINK: initialize track handle to null
- initialize track handle to null
- prevent invoking audiotrack API in case handle is null
Bug:
27613411
Change-Id: I1a8637fd2cbb3012b29c1930f978100e7f0c58d8
Ajay Panicker [Mon, 4 Apr 2016 18:55:24 +0000 (18:55 +0000)]
Fix line wrapping for btsnooz am:
1f4a839
am:
7807dbd
* commit '
7807dbdbc99d942e4f47b5902fe0bc7a77cba142':
Fix line wrapping for btsnooz
Change-Id: Ia9c3ae2223cddad4f94ebd837eefa1e10185fe45
Andre Eisenbach [Mon, 4 Apr 2016 18:55:24 +0000 (18:55 +0000)]
Fix btsnooz.py multi-line base64 decoding am:
2b70aa4
am:
a77624f
* commit '
a77624fc2f3c5dbc33cbc4b90219240705262129':
Fix btsnooz.py multi-line base64 decoding
Change-Id: I6a33d2d83affa6b274ee4c1012a6e70de66e0928
Ajay Panicker [Mon, 4 Apr 2016 18:53:03 +0000 (18:53 +0000)]
Fix line wrapping for btsnooz
am:
1f4a839
* commit '
1f4a83932fc0201c7d53220edaedfe05c0e77444':
Fix line wrapping for btsnooz
Change-Id: I8eeb080b802c67f83d1f5d2c08bea92fb2058f2f
Andre Eisenbach [Mon, 4 Apr 2016 18:53:02 +0000 (18:53 +0000)]
Fix btsnooz.py multi-line base64 decoding
am:
2b70aa4
* commit '
2b70aa4406d8b3fcc26c191896a30db37b0846bb':
Fix btsnooz.py multi-line base64 decoding
Change-Id: I96a32c1e6053b58592d523c47a38838a3d86ae61
Ajay Panicker [Fri, 1 Apr 2016 21:02:06 +0000 (14:02 -0700)]
Fix line wrapping for btsnooz
Change-Id: I4558c652577ffeb3f1ac4f273472ccf98d70924b
Andre Eisenbach [Sat, 2 Apr 2016 00:47:54 +0000 (17:47 -0700)]
Fix btsnooz.py multi-line base64 decoding
Change-Id: Ie915c52d8a7eada10f68999c40a2b50b35f640e2
Ajay Panicker [Sat, 2 Apr 2016 00:00:41 +0000 (00:00 +0000)]
Merge "Allow factory reset when bluetooth is off (2/2)" am:
de5fdee
am:
88ea5d2
* commit '
88ea5d21b92055ed8a8eae6e576abeb3cc7bf0e9':
Allow factory reset when bluetooth is off (2/2)
Change-Id: I835a04762ce9df854193775644f0468fc4c6a08e
Ajay Panicker [Fri, 1 Apr 2016 23:57:58 +0000 (23:57 +0000)]
Merge "Allow factory reset when bluetooth is off (2/2)"
am:
de5fdee
* commit '
de5fdeee2ac3883b7f4d018a84ac8ad14aab6d81':
Allow factory reset when bluetooth is off (2/2)
Change-Id: I43855e84e1845bc468a3c1ed1c6a325b200b1385
Ajay Panicker [Fri, 1 Apr 2016 23:46:33 +0000 (23:46 +0000)]
Merge "Allow factory reset when bluetooth is off (2/2)"
Pavlin Radoslavov [Fri, 1 Apr 2016 21:57:45 +0000 (21:57 +0000)]
Add a log message to capture empty queue in l2c_enqueue_peer_data() am:
c4de4cb
am:
672d4e8
* commit '
672d4e8703bbce855f614a062bd20ac6f1e12f5b':
Add a log message to capture empty queue in l2c_enqueue_peer_data()
Change-Id: I6d2f5e21e6b37fb56ce448f1c51907d21990864a
Pavlin Radoslavov [Fri, 1 Apr 2016 21:53:06 +0000 (21:53 +0000)]
Add a log message to capture empty queue in l2c_enqueue_peer_data()
am:
c4de4cb
* commit '
c4de4cb0560c35c81e357560db3cfb4cbc70cca7':
Add a log message to capture empty queue in l2c_enqueue_peer_data()
Change-Id: I49854a97fb1e5bb942d79a12c268be554c74c280
Pavlin Radoslavov [Fri, 1 Apr 2016 03:22:29 +0000 (20:22 -0700)]
Add a log message to capture empty queue in l2c_enqueue_peer_data()
Add a log message in l2c_enqueue_peer_data() to help capture
an empty queue p_ccb->xmit_hold_q that is triggering an assert.
Also:
* Fix a memory leak inside l2cu_initialize_fixed_ccb()
p_ccb queues have been allocated again even though
they have been allocated previously within l2cu_allocate_ccb()
* Fix a typo in a comment: clodes -> closed
* Removed repeated function declarations in file l2c_int.h
Bug:
27821847
Change-Id: I2df2843710310acf5a46c6fa5b302cf7390bc1b4
Ajay Panicker [Tue, 1 Mar 2016 00:18:12 +0000 (16:18 -0800)]
Allow factory reset when bluetooth is off (2/2)
Bug:
27348444
Change-Id: Idf0c0bda892c76be037fd28ed352237d4c5b8263
Sanket Agarwal [Wed, 30 Mar 2016 20:37:46 +0000 (20:37 +0000)]
BUILD FIX: BTIF_MEDIA_FOCUS_NOT_GRANTED should be complied only for SINK am:
26df1e0
am:
9323de5 -s ours
* commit '
9323de55626c984615ae02786fb586edbaafe6be':
BUILD FIX: BTIF_MEDIA_FOCUS_NOT_GRANTED should be complied only for SINK
Change-Id: Ic3b090d0931c0309edb0346aca953fbea61309d5
Sanket Agarwal [Wed, 30 Mar 2016 20:28:22 +0000 (20:28 +0000)]
BUILD FIX: BTIF_MEDIA_FOCUS_NOT_GRANTED should be complied only for SINK
am:
26df1e0
* commit '
26df1e027a47d1d3cf5a0ecf64b2d8f0ab8733ae':
BUILD FIX: BTIF_MEDIA_FOCUS_NOT_GRANTED should be complied only for SINK
Change-Id: I0c53650ca481f425ccc22b917018fde8c3f21448
Sanket Agarwal [Wed, 30 Mar 2016 19:21:30 +0000 (12:21 -0700)]
BUILD FIX: BTIF_MEDIA_FOCUS_NOT_GRANTED should be complied only for SINK
Since BTIF_MEDIA_FOCUS_NOT_GRANTED is only applicable for focus handling
in A2DP SINK scenario it is only defined and protected by
USE_AUDIO_TRACK.
BUG:
26928143
Change-Id: I414bda160270838c9bc911fef9798a95e1f34ec8
Sanket Agarwal [Wed, 30 Mar 2016 19:06:56 +0000 (19:06 +0000)]
Move focus handling entirely to component calling fluoride. am:
37ee8f8
am:
94be648 -s ours
* commit '
94be6483f0138d2afb04e8dec5d60cf733668f69':
Move focus handling entirely to component calling fluoride.
Change-Id: I8a2ad075d2a7e9f01e9f182dc5c4376a914c03ab
Sanket Agarwal [Wed, 30 Mar 2016 18:58:30 +0000 (18:58 +0000)]
Remove %s from Log message. am:
45d296c
am:
ee57c26
* commit '
ee57c26509ca514321dffbfd191795d4a5f24e8c':
Remove %s from Log message.
Change-Id: I5ebf65d6f514127317622e8353747c31ab77a9dc
Sanket Agarwal [Wed, 30 Mar 2016 18:54:17 +0000 (18:54 +0000)]
Move focus handling entirely to component calling fluoride.
am:
37ee8f8
* commit '
37ee8f84a31cbf74b1c3050d6271bef05105b8bb':
Move focus handling entirely to component calling fluoride.
Change-Id: Ibd02c78f46358f42706fbaddd4f9465dc7d43c18
Sanket Agarwal [Wed, 30 Mar 2016 18:54:17 +0000 (18:54 +0000)]
Remove %s from Log message.
am:
45d296c
* commit '
45d296cb6dd4ac3ec47a685ca14013270eea0fea':
Remove %s from Log message.
Change-Id: I57440995d13dbaecf03134226556b00109f180d3
Sanket Agarwal [Wed, 10 Feb 2016 23:24:09 +0000 (15:24 -0800)]
Move focus handling entirely to component calling fluoride.
Audio focus handling for A2DP sink currently split between Fluoride and
the component sitting on top of it. Since this is not the best place to
decide policies, we move all such decisions to the upper layer.
Bug: b/
26928143
Change-Id: I67a1a2a50782289e7e31447b01ee29a21bc8dac2
Sanket Agarwal [Sat, 13 Feb 2016 18:19:45 +0000 (10:19 -0800)]
Remove %s from Log message.
This crashes when A2DP SNK role is executed in print statement.
Change-Id: Iceca09ecc5977a5379d7f98f265fc2d52332c6e4
Jaganath Kanakkassery [Wed, 30 Mar 2016 18:41:31 +0000 (18:41 +0000)]
Avoid using alarm APIs for LPM when Idle timeout is zero am:
12751e1
am:
9d611f8
* commit '
9d611f8ae69f686ae44f5611feeee51bca5b6655':
Avoid using alarm APIs for LPM when Idle timeout is zero
Change-Id: Ie7ff61030170f6e0f7f43aed4b4bc2404ec48c42
Jaganath Kanakkassery [Wed, 30 Mar 2016 18:36:51 +0000 (18:36 +0000)]
Avoid using alarm APIs for LPM when Idle timeout is zero
am:
12751e1
* commit '
12751e1d81fae508d8c47b56f532ab6e28aadd30':
Avoid using alarm APIs for LPM when Idle timeout is zero
Change-Id: I22283f1b1d8fe1b702f64cfac7a45462b7fbdc24
Jaganath Kanakkassery [Fri, 12 Feb 2016 15:03:06 +0000 (20:33 +0530)]
Avoid using alarm APIs for LPM when Idle timeout is zero
For some vendors the idle timer value is configured to zero. But with
the current LPM timer implementation it will use the alarm APIs to
schedule wake_deassert(), which introduces context switch overhead.
The code is modified to trigger the wake_deassert immediately if the
idle timeout value is configured to zero. These changes improve OPP
throughput.
Change-Id: Ic48e7b990ccf55525a0d15b65c03daedfe03c582
Signed-off-by: Jaganath Kanakkassery <jaganathx.kanakkassery@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Andre Eisenbach [Wed, 30 Mar 2016 18:06:18 +0000 (18:06 +0000)]
Remove unused p_db for A2DP service discovery am:
895c094
am:
0613537
* commit '
0613537960781779067650f6c325cf48edf650bd':
Remove unused p_db for A2DP service discovery
Change-Id: I85937c56164ba8037e7604b0feef1925a9c83ab0
Andre Eisenbach [Wed, 30 Mar 2016 18:01:22 +0000 (18:01 +0000)]
Remove unused p_db for A2DP service discovery
am:
895c094
* commit '
895c09477932acb3888961ac7d1c122c36f067d1':
Remove unused p_db for A2DP service discovery
Change-Id: I7b61ce31db707f4c672da5b6af4938c06dfa9a04
Andre Eisenbach [Fri, 25 Mar 2016 23:48:44 +0000 (16:48 -0700)]
Remove unused p_db for A2DP service discovery
This fixes a crash (SIGSEGV) when re-connecting A2DP devices where the
SDP pointer was incorrectly reset to 0.
Bug:
27852645
Change-Id: Ie40b7e57fc117c6fe7a42020600745ef348b503c
Pavlin Radoslavov [Mon, 28 Mar 2016 20:29:39 +0000 (20:29 +0000)]
Don\'t destroy BTIF Device Management state during shutdown
am:
fb5a382
* commit '
fb5a38213b65716b7fa9f0596f3e2e60d6d9f00c':
Don't destroy BTIF Device Management state during shutdown
Pavlin Radoslavov [Sat, 26 Mar 2016 01:55:30 +0000 (18:55 -0700)]
Don't destroy BTIF Device Management state during shutdown
Don't call btif_dm_cleanup() during stack shutdown stage,
because it will destroy/free internal state that might be used
later in the shutdown process.
Instead, btif_dm_cleanup() should happen during the stack
cleanup stage.
Also, added an unit test to capture the original issue.
Bug:
27856457
Change-Id: I8575537ad744cf4e6770046b779b6a53de93d66e
Jakub Pawlowski [Sat, 26 Mar 2016 05:39:45 +0000 (05:39 +0000)]
linux build fix
am:
815a8d4
* commit '
815a8d41cae1a01abdbeb6586c4365d33fa3bbb0':
linux build fix
Jakub Pawlowski [Sat, 26 Mar 2016 05:31:41 +0000 (22:31 -0700)]
linux build fix
Change-Id: Ibec71d18e664f575f73a472b7a522e87c3a1efa8
Zhao Xuewen [Thu, 24 Mar 2016 23:45:11 +0000 (23:45 +0000)]
Bluetooth: Fix the issue that peer A2DP SNK device can not auto-reconnect.
am:
5bd9ffb
* commit '
5bd9ffbe6fbf22b7072bc1a63e3152a916276ddf':
Bluetooth: Fix the issue that peer A2DP SNK device can not auto-reconnect.
Zhao Xuewen [Thu, 4 Feb 2016 03:20:14 +0000 (11:20 +0800)]
Bluetooth: Fix the issue that peer A2DP SNK device can not auto-reconnect.
If peer A2DP SNK disconnected by some reason, the device will reject reconnection request from peer.
This CL will judge the peer device is A2DP SRC, will reject the reconnection request.
So if peer device is A2DP SNK, will accept the reconnection request.
BUG:
26274393
Change-Id: Idecef527a763693f08d76d90512546f013312aa1
Signed-off-by: z00184990 <z00184990@notesmail.huawei.com>
Signed-off-by: Zhao Xuewen <zhaoxuewen@huawei.com>