OSDN Git Service
Kim Schulz [Fri, 30 Sep 2016 19:53:05 +0000 (19:53 +0000)]
Merge "Do not request remote name from non-connectable dev" am:
49109aefb0 am:
13e05a1959
am:
3ab83c181e
Change-Id: I206199b593ad932e6603ffe4e34322cdfb3295f7
Kim Schulz [Fri, 30 Sep 2016 19:49:29 +0000 (19:49 +0000)]
Merge "Do not request remote name from non-connectable dev" am:
49109aefb0
am:
13e05a1959
Change-Id: Id6c15d6012a7a2d6edfbee1e24ef81fba25e93ac
Patrick Tsai [Fri, 30 Sep 2016 19:47:25 +0000 (19:47 +0000)]
Merge "Fix warnings of implicit function declaration in Linux vendor lib" am:
c4c9923724 am:
feaf001c2d
am:
7ed28e9b28
Change-Id: Ie041880ef40b5a0f5a873caa0332ba5b4da20aec
Kim Schulz [Fri, 30 Sep 2016 19:46:29 +0000 (19:46 +0000)]
Merge "Do not request remote name from non-connectable dev"
am:
49109aefb0
Change-Id: Iae4d72d5ed0c452085adf36b0c27daa61c45a8ae
Patrick Tsai [Fri, 30 Sep 2016 19:43:08 +0000 (19:43 +0000)]
Merge "Fix warnings of implicit function declaration in Linux vendor lib" am:
c4c9923724
am:
feaf001c2d
Change-Id: I18d5825d09aba13e37ece6e8b63b5087bd729d08
Treehugger Robot [Fri, 30 Sep 2016 19:40:53 +0000 (19:40 +0000)]
Merge "Do not request remote name from non-connectable dev"
Patrick Tsai [Fri, 30 Sep 2016 19:40:06 +0000 (19:40 +0000)]
Merge "Fix warnings of implicit function declaration in Linux vendor lib"
am:
c4c9923724
Change-Id: I1d4d89be2d72f13e9bd5ae8b4b90856b21e3a0b9
Treehugger Robot [Fri, 30 Sep 2016 19:33:46 +0000 (19:33 +0000)]
Merge "Fix warnings of implicit function declaration in Linux vendor lib"
Sebastien Griffoul [Fri, 30 Sep 2016 19:14:53 +0000 (19:14 +0000)]
Fix NULL pointer crash in send_at_cmd am:
5c8fa2b199 am:
907d1e9cdc
am:
0df96a52b2
Change-Id: I575c15a4cc39000c494cb69ef1647d3161032a74
Sebastien Griffoul [Fri, 30 Sep 2016 19:11:41 +0000 (19:11 +0000)]
Fix NULL pointer crash in send_at_cmd am:
5c8fa2b199
am:
907d1e9cdc
Change-Id: Iccd3eb172e6bdae93aab0dbf7724d5a73beba379
Sebastien Griffoul [Fri, 30 Sep 2016 19:08:42 +0000 (19:08 +0000)]
Fix NULL pointer crash in send_at_cmd
am:
5c8fa2b199
Change-Id: I64b04cbf63438f25e58b700a9af6fe1d51a3905b
Kim Schulz [Fri, 29 Apr 2016 08:26:02 +0000 (10:26 +0200)]
Do not request remote name from non-connectable dev
if an LE device is found during an LE scan, the BT host will try to fetch its name (creating an LE
connection) even though the advertising report received indicates that it is a non-connectable
advertising.
This is pointless and should not happen.
Change-Id: I246e4795b4f4e33f3202908ebff3724e8e89523c
Patrick Tsai [Sat, 19 Mar 2016 04:12:34 +0000 (21:12 -0700)]
Fix warnings of implicit function declaration in Linux vendor lib
Change-Id: I482f1096e87966f33ba8584ea60188abab3bcc42
Sebastien Griffoul [Fri, 17 Oct 2014 10:14:19 +0000 (12:14 +0200)]
Fix NULL pointer crash in send_at_cmd
If the string argument of send_at_cmd is a null pointer,
then the function should not crash: indeed this is a valid
parameters which can be used to send an AT cmd which doesn't
require any extra parameter.
Test: trivial fix. Existing unit tests still pass.
Change-Id: I3d83eebed660d703cd5a93a19dc73f4f354ab7bf
Signed-off-by: Sebastien Griffoul <sebastien.griffoul@intel.com>
Jakub Pawlowski [Fri, 30 Sep 2016 00:25:53 +0000 (00:25 +0000)]
Enable libbase logging for whole stack am:
75b83661ea am:
8d81059e2f
am:
1f161a621d
Change-Id: If12246cb7f0a7ecc7814d8b70e543c6a2b1d883b
Jakub Pawlowski [Fri, 30 Sep 2016 00:24:21 +0000 (00:24 +0000)]
Enable libbase logging for whole stack am:
75b83661ea
am:
8d81059e2f
Change-Id: I7d89ff65ad5de2d0756cab4ffdb6cf77cf34b9ac
Jakub Pawlowski [Fri, 30 Sep 2016 00:22:21 +0000 (00:22 +0000)]
Enable libbase logging for whole stack
am:
75b83661ea
Change-Id: Ic09c0c3bfefbad2e8949f29b9d36c8fa13b266ae
Jakub Pawlowski [Wed, 28 Sep 2016 01:24:59 +0000 (18:24 -0700)]
Enable libbase logging for whole stack
Currently, only C++ code in the service/ folder can use libbase logging.
This patch makes sure that logging can be used and is properly
configured for usage when the stack is running as part of Bluetooth.apk.
Bug:
31806042
Change-Id: I1f8be79ba9999b53ece0b5217a893b4bd20ecafc
Victor Khimenko [Thu, 29 Sep 2016 06:26:54 +0000 (06:26 +0000)]
Merge "Support TARGET_TRANSLATE_2ND_ARCH case" am:
d09a76a935 am:
b874d655ef
am:
f0105e5a76
Change-Id: I7486a2559590d1f9d3840ddaeb5f0ea62f643c4d
Victor Khimenko [Thu, 29 Sep 2016 06:17:08 +0000 (06:17 +0000)]
Merge "Support TARGET_TRANSLATE_2ND_ARCH case" am:
d09a76a935
am:
b874d655ef
Change-Id: I9d091454c236d3f5bd6c3f96725869f2c563bbb0
Victor Khimenko [Thu, 29 Sep 2016 06:13:07 +0000 (06:13 +0000)]
Merge "Support TARGET_TRANSLATE_2ND_ARCH case"
am:
d09a76a935
Change-Id: Ib9c919256db089ed4ef859016d46ae8ec7791bdd
Victor Khimenko [Thu, 29 Sep 2016 06:08:00 +0000 (06:08 +0000)]
Merge "Support TARGET_TRANSLATE_2ND_ARCH case"
Andre Eisenbach [Thu, 29 Sep 2016 02:15:34 +0000 (02:15 +0000)]
Fix 100 LE device connection limitation am:
426da5ad3c am:
9856bc202b
am:
302e9575d9
Change-Id: Id03b9a333606ac01d7283fa7de0aa92d81c53fee
Andre Eisenbach [Thu, 29 Sep 2016 02:05:21 +0000 (02:05 +0000)]
Fix 100 LE device connection limitation am:
426da5ad3c
am:
9856bc202b
Change-Id: Ieb9e1d2870574c8cf0efdf9fa86bed634db38c96
Andre Eisenbach [Thu, 29 Sep 2016 02:02:20 +0000 (02:02 +0000)]
Fix 100 LE device connection limitation
am:
426da5ad3c
Change-Id: Ie9d7439eda57bfaeac544bc35f6100413b1fe354
Andre Eisenbach [Thu, 29 Sep 2016 00:26:14 +0000 (17:26 -0700)]
Merge commit '
7e701dbd4375ee00c3b72d4bda970d444f20c470' into manual_merge_7e701db
Change-Id: I12e74839725fe33e6739517e454a0941aa4bd986
Andre Eisenbach [Wed, 28 Sep 2016 01:07:58 +0000 (18:07 -0700)]
Fix 100 LE device connection limitation
Currently after 100 devices are added to the device security database,
any subsequent LE connection to a newly discovered LE device address
will fail as entries in the security record database are not reused.
This patch removes a device record if the device itself is removed and
also ensures that the oldest device security record is deleted if the
limit is reached to ensure a new record can be allocated.
Bug:
31625900
Test: SL4A multi-device connection test + regression
Change-Id: I22f6c82c64a9a9bfb2a16d79182903e5aa011355
(cherry picked from commit
013c32bf98b8d511dc29fcd7de7578a421a52590)
Andre Eisenbach [Wed, 28 Sep 2016 23:53:42 +0000 (23:53 +0000)]
Fix 100 LE device connection limitation
am:
013c32bf98
Change-Id: I64d57c1a19e41bcf35569eb707f58d31c9a54d63
Victor Khimenko [Wed, 28 Sep 2016 22:40:03 +0000 (00:40 +0200)]
Support TARGET_TRANSLATE_2ND_ARCH case
Build-only change to support the multilib case where the second arch
is translated (and thus bluetooth library is needed).
"True" multilib case is explicitly not supported.
Test: Build system refactoring CL. Existing unit tests still pass.
BUG=
31422117
Change-Id: I09f239d39f5dbe0848a89367327db1ea1074ca39
Jakub Pawlowski [Wed, 28 Sep 2016 21:30:31 +0000 (21:30 +0000)]
Separate the definition of BTM layer types from control blocks am:
dc3c1f2afa am:
f7af15140a
am:
b5a4a143de
Change-Id: Ifc520da330610371c16e2d1b5e418f1ecfff8b02
Jakub Pawlowski [Wed, 28 Sep 2016 21:27:02 +0000 (21:27 +0000)]
Separate the definition of BTM layer types from control blocks am:
dc3c1f2afa
am:
f7af15140a
Change-Id: I328bc6141dcc895530b93dca2981bd4bfeeb3da1
Jakub Pawlowski [Wed, 28 Sep 2016 21:24:01 +0000 (21:24 +0000)]
Separate the definition of BTM layer types from control blocks
am:
dc3c1f2afa
Change-Id: Iea26880f80f623744cd96b40c27188428b7d9860
Jakub Pawlowski [Wed, 28 Sep 2016 16:02:39 +0000 (09:02 -0700)]
Separate the definition of BTM layer types from control blocks
Right now, data types, control blocks, and functions used in the BTM
layer are defined in the same header files. This means that if someone
wants to write a test that uses those data types, they must also define
all control blocks, or compile the whole module.
This patch separates the data types from other definitions. Thanks to
it, we will be able to write unit tests, once other dependencies get
separated.
Change-Id: Ibc089e273cc37642fbb8672964b266c20f8d825d
Andre Eisenbach [Wed, 28 Sep 2016 01:07:58 +0000 (18:07 -0700)]
Fix 100 LE device connection limitation
Currently after 100 devices are added to the device security database,
any subsequent LE connection to a newly discovered LE device address
will fail as entries in the security record database are not reused.
This patch removes a device record if the device itself is removed and
also ensures that the oldest device security record is deleted if the
limit is reached to ensure a new record can be allocated.
Bug:
31625900
Change-Id: I22f6c82c64a9a9bfb2a16d79182903e5aa011355
Jakub Pawlowski [Tue, 27 Sep 2016 18:48:00 +0000 (18:48 +0000)]
Use better callbacks in LE multi advertising am:
0a009c382f am:
2f7dd70c11
am:
1127103c3b
Change-Id: Ib24640b13cb8c2f4978b05ce68ebba106be89238
Jakub Pawlowski [Tue, 27 Sep 2016 18:45:37 +0000 (18:45 +0000)]
Use better callbacks in LE multi advertising am:
0a009c382f
am:
2f7dd70c11
Change-Id: Id0d07632d059a984dc350b69f8548aad88b61a3c
Jakub Pawlowski [Tue, 27 Sep 2016 18:42:32 +0000 (18:42 +0000)]
Use better callbacks in LE multi advertising
am:
0a009c382f
Change-Id: Ia9e39fe19443641b6d17cc8e78e8156b5304619f
Jakub Pawlowski [Tue, 6 Sep 2016 14:42:36 +0000 (07:42 -0700)]
Use better callbacks in LE multi advertising
Right now, LE multi advertising related code uses it's own
implementation of queue on top of static array. Use std::queue, and
base::Callback instead.
Changing function pointers to base::Callback instances is required for
further refactoring, which will turn this code into class.
Bug:
30622771
Test: sl4a BleAdvertiseApiTest ConcurrentBleAdvertisingTest
Change-Id: I839e036c6edb4e19a17def4d68d351296468f88c
Jakub Pawlowski [Tue, 27 Sep 2016 15:58:05 +0000 (15:58 +0000)]
Fix unnecessary error message during GATT discovery am:
f2e3bea844
am:
7edffcd474 -s ours
Change-Id: Ic99ab24d1000f5f9fbd75f937d9675d96bfac57e
Jakub Pawlowski [Tue, 27 Sep 2016 15:44:34 +0000 (15:44 +0000)]
Fix unnecessary error message during GATT discovery
am:
f2e3bea844
Change-Id: Ied4363b52980f4a1e146c6186ffe920770f65866
Jakub Pawlowski [Tue, 27 Sep 2016 15:39:34 +0000 (15:39 +0000)]
Update BUILD.gn files am:
29796eb6de am:
d42287dd61
am:
59a4789cd8
Change-Id: I089264ea9600e498df77c2f01df9f851c70c3c79
Jakub Pawlowski [Tue, 27 Sep 2016 15:36:04 +0000 (15:36 +0000)]
Update BUILD.gn files am:
29796eb6de
am:
d42287dd61
Change-Id: Ic0c3dfae0e723d55ea53feb8c024579e66dbb443
Jakub Pawlowski [Tue, 27 Sep 2016 15:33:33 +0000 (15:33 +0000)]
Update BUILD.gn files
am:
29796eb6de
Change-Id: I41391c0764e9def86ff32e72e65222e0c3f6043f
Jakub Pawlowski [Tue, 27 Sep 2016 15:21:55 +0000 (08:21 -0700)]
Update BUILD.gn files
Jakub Pawlowski [Mon, 26 Sep 2016 21:05:18 +0000 (14:05 -0700)]
Fix unnecessary error message during GATT discovery
Bug:
31637098
Change-Id: Ib2545e7827bd338d2e22c88836818fce23e7a057
Nitin Arora [Sat, 24 Sep 2016 00:34:44 +0000 (00:34 +0000)]
Bluetooth: Prevent gatt DB copy if server cache is absent am:
c695f2578d am:
1b85fb000a
am:
ec5ff3d956
Change-Id: I0c6e040a8b9e8256e55145a8b929fb99d77135c4
Nitin Arora [Sat, 24 Sep 2016 00:32:37 +0000 (00:32 +0000)]
Bluetooth: Prevent gatt DB copy if server cache is absent am:
c695f2578d
am:
1b85fb000a
Change-Id: If0b5f4f2e397cf269ed25b684eacf5ea3fb65e51
Nitin Arora [Sat, 24 Sep 2016 00:31:06 +0000 (00:31 +0000)]
Bluetooth: Prevent gatt DB copy if server cache is absent
am:
c695f2578d
Change-Id: Ic25dfb446c5133823523e3b707177739d1296a9a
Nitin Arora [Thu, 14 Jul 2016 01:02:03 +0000 (18:02 -0700)]
Bluetooth: Prevent gatt DB copy if server cache is absent
In case the server cache does not exist for a specific
connection, the API used to copy the server DB into the
DB structure needs to return immediately. This change
makes sure of that and prevents dereferencing of a null
block causing the runtime error.
Change-Id: Iec3040a1280ef9d80b1b9c76eca8071dff499411
Jakub Pawlowski [Fri, 23 Sep 2016 21:06:40 +0000 (21:06 +0000)]
Merge "Convert BLE multi-advertising code to C++" am:
6cbb6f8c37 am:
b2d733b15b
am:
0f174ee3a8
Change-Id: I8198ec8bb793e675bc6d3673e4d58d784d7fd8dd
Jakub Pawlowski [Fri, 23 Sep 2016 21:04:40 +0000 (21:04 +0000)]
Merge "Convert BLE multi-advertising code to C++" am:
6cbb6f8c37
am:
b2d733b15b
Change-Id: I33565f33735b1143a8c6971aed4a25e2ce71a924
Jakub Pawlowski [Fri, 23 Sep 2016 21:02:40 +0000 (21:02 +0000)]
Merge "Convert BLE multi-advertising code to C++"
am:
6cbb6f8c37
Change-Id: I917c9c38fafc5b8a4e537c89038e5bdd056e7c4c
Jakub Pawlowski [Fri, 23 Sep 2016 20:53:24 +0000 (20:53 +0000)]
Merge "Convert BLE multi-advertising code to C++"
chaoyu.x.wu [Fri, 23 Sep 2016 20:00:06 +0000 (20:00 +0000)]
Fix the BLE connection failure with some mice am:
58c27b48aa
am:
1b97714aa8
Change-Id: I3cd24bae9b2015b7776d9b4aad96f643344cfcc4
chaoyu.x.wu [Fri, 23 Sep 2016 19:56:34 +0000 (19:56 +0000)]
Fix the BLE connection failure with some mice
am:
58c27b48aa
Change-Id: I45bdf4a316fca554c8c85cefdb87cff0cd2d21e6
Ajay Panicker [Fri, 23 Sep 2016 19:17:32 +0000 (19:17 +0000)]
Merge "Move btsnoop_hci.log to /data/misc/bluetooth/logs" am:
b64d604c0c am:
271a06c67d
am:
f5c6c7b801
Change-Id: I66fe55ba8ba938e097a321921a29abc4f40cf791
Ajay Panicker [Fri, 23 Sep 2016 19:15:32 +0000 (19:15 +0000)]
Merge "Move btsnoop_hci.log to /data/misc/bluetooth/logs" am:
b64d604c0c
am:
271a06c67d
Change-Id: I7f27d2f0bd6b0bf303e570cc376d90397a36d390
Ajay Panicker [Fri, 23 Sep 2016 19:13:32 +0000 (19:13 +0000)]
Merge "Move btsnoop_hci.log to /data/misc/bluetooth/logs"
am:
b64d604c0c
Change-Id: I87d5ef9224da76d569c2e4b32782f839686590df
Ajay Panicker [Fri, 23 Sep 2016 19:00:17 +0000 (19:00 +0000)]
Merge "Move btsnoop_hci.log to /data/misc/bluetooth/logs"
Jakub Pawlowski [Mon, 5 Sep 2016 11:31:34 +0000 (04:31 -0700)]
Convert BLE multi-advertising code to C++
This patch converts btm_ble_multi_adv.c file to .cc. It also separate
header definitions from rest of BTM layer. It is another step towards
making BLE advertising-related code testable.
Bug:
30622771
Change-Id: I89965e10fbf773e48176ee19ef613dd0df2fb951
chaoyu.x.wu [Mon, 11 Apr 2016 06:08:48 +0000 (14:08 +0800)]
Fix the BLE connection failure with some mice
If enable the "connection parameters update" during GATT discovery,
it may cause some device connection failure due to connection timeout.
Since the the "connection parameter update" is enabled again when GATT
discovery completed, remove the enable of "connection parameter update"
after SMP complete to fix the issue.
This issue was already fixed in commit
2d41fe1c, but then it was
re-introduced in commit
444a8da8, which also removed comment explaining
the issue, added back in this patch.
Bug:
29060797
Change-Id: I42b0b36056821c30d887484e22bfcbd04ea7ca03
(cherry picked from commit
1ec17e06c73c67592aeda29e0aaa03580fdecce9)
Pavlin Radoslavov [Thu, 22 Sep 2016 23:33:38 +0000 (23:33 +0000)]
Removed usage of A2DP codec_type as a separate field am:
b3e5af36e9 am:
a21c8ebcd9
am:
809d61b769
Change-Id: Id8f093ab2e77b1368d8fc60b41882663eec0da2a
Pavlin Radoslavov [Thu, 22 Sep 2016 23:28:07 +0000 (23:28 +0000)]
Removed usage of A2DP codec_type as a separate field am:
b3e5af36e9
am:
a21c8ebcd9
Change-Id: I12bee5b45667e7e95e94b463050709becd078776
Pavlin Radoslavov [Thu, 22 Sep 2016 23:25:37 +0000 (23:25 +0000)]
Removed usage of A2DP codec_type as a separate field
am:
b3e5af36e9
Change-Id: I886c6b3cbaa9cd1abdfc8340e586f5cd2dc33cc2
chaoyu.x.wu [Thu, 22 Sep 2016 23:17:27 +0000 (23:17 +0000)]
Fix the BLE connection failure with some mice am:
1ec17e06c7 am:
3047313009
am:
de7bd173ea
Change-Id: I38e941f96497a19bdc138cbb6a24c5c1c5de69d7
Ajay Panicker [Thu, 22 Sep 2016 23:17:16 +0000 (23:17 +0000)]
Merge "Fix improper null check when handling rc features" am:
e90972c9f2 am:
025f04f15c
am:
aa9f7f5cec
Change-Id: I7b2dc0e5e0946d2ee1d36571b86332dcc04dc421
chaoyu.x.wu [Thu, 22 Sep 2016 22:54:16 +0000 (22:54 +0000)]
Fix the BLE connection failure with some mice am:
1ec17e06c7
am:
3047313009
Change-Id: I91c3d42d8a00e8b7daa163d648085926868ef725
chaoyu.x.wu [Thu, 22 Sep 2016 21:58:35 +0000 (21:58 +0000)]
Fix the BLE connection failure with some mice
am:
1ec17e06c7
Change-Id: Ib5b03ac545fee9c71ae53d869615a1f0fc155182
Ajay Panicker [Thu, 22 Sep 2016 21:58:18 +0000 (21:58 +0000)]
Merge "Remove net_bt_stack group and replace it with bluetooth" am:
b85d405374 am:
2c189b27ba
am:
f41808ab56
Change-Id: I3be0afd27e9e395627c68c3338a61eb0f7e7db38
Pavlin Radoslavov [Tue, 20 Sep 2016 21:10:08 +0000 (14:10 -0700)]
Removed usage of A2DP codec_type as a separate field
The value of codec_type can be extracted from the codec_info,
so it is not needed to pass it around as an argument, or keep
it as an field.
Also:
* Added new APIs and the corresponding unit tests:
- A2D_GetPacketTimestamp()
- A2D_BuildCodecHeader() - replacement for bta_av_sbc_bld_hdr()
- A2D_CodecName()
* Replaced tBTA_AV_SEP.codec_type with tBTA_AV_SEP.codec_info
Bug:
30958229
Test: A2DP tested manually. Unit tests included in the CL.
Change-Id: I3bfd4750e8639d77a9938ab3c274c9d6ea859fb6
Ajay Panicker [Wed, 14 Sep 2016 18:46:23 +0000 (11:46 -0700)]
Move btsnoop_hci.log to /data/misc/bluetooth/logs
Bug:
31466840
Change-Id: Ibd8f8b85eb59be8bfbb8a7c83b5935802624a748
chaoyu.x.wu [Mon, 11 Apr 2016 06:08:48 +0000 (14:08 +0800)]
Fix the BLE connection failure with some mice
If enable the "connection parameters update" during GATT discovery,
it may cause some device connection failure due to connection timeout.
Since the the "connection parameter update" is enabled again when GATT
discovery completed, remove the enable of "connection parameter update"
after SMP complete to fix the issue.
This issue was already fixed in commit
2d41fe1c, but then it was
re-introduced in commit
444a8da8, which also removed comment explaining
the issue, added back in this patch.
Bug:
29060797
Change-Id: I42b0b36056821c30d887484e22bfcbd04ea7ca03
Ajay Panicker [Thu, 22 Sep 2016 11:53:45 +0000 (11:53 +0000)]
Merge "Fix improper null check when handling rc features" am:
e90972c9f2
am:
025f04f15c
Change-Id: Ib00b67cf8b74258d31322d5f6c5241c2ed629b28
Ajay Panicker [Thu, 22 Sep 2016 11:23:41 +0000 (11:23 +0000)]
Merge "Remove net_bt_stack group and replace it with bluetooth" am:
b85d405374
am:
2c189b27ba
Change-Id: Ia6fda2cd85dfdacc60d5d3e5ef7944798802de01
Keizo Mendori [Thu, 22 Sep 2016 09:14:35 +0000 (09:14 +0000)]
Blacklist Motorola Roadster for Absolute Volume am:
e89122a9c9 am:
c3ceceaa8b
am:
27962021e4
Change-Id: I8b931c35b7aa10c95412343544816fcb00f25e71
Ajay Panicker [Thu, 22 Sep 2016 08:21:11 +0000 (08:21 +0000)]
Merge "Fix improper null check when handling rc features"
am:
e90972c9f2
Change-Id: I228b1a0befa5becf1c60ca5eaa4b8b1a1e2292f8
Ajay Panicker [Thu, 22 Sep 2016 08:09:28 +0000 (08:09 +0000)]
Merge "Remove net_bt_stack group and replace it with bluetooth"
am:
b85d405374
Change-Id: Iea39edaa3c6294001384597a151906aacf423980
Treehugger Robot [Thu, 22 Sep 2016 01:49:03 +0000 (01:49 +0000)]
Merge "Fix improper null check when handling rc features"
Ajay Panicker [Thu, 22 Sep 2016 01:32:33 +0000 (01:32 +0000)]
Merge "Remove net_bt_stack group and replace it with bluetooth"
Ajay Panicker [Wed, 21 Sep 2016 23:35:00 +0000 (16:35 -0700)]
Fix improper null check when handling rc features
Bug:
31533166
Change-Id: Ia04e9c51280a3e379c0670b39a84eb5a53c5332b
Keizo Mendori [Wed, 21 Sep 2016 23:31:18 +0000 (23:31 +0000)]
Blacklist Motorola Roadster for Absolute Volume am:
e89122a9c9
am:
c3ceceaa8b
Change-Id: I93ea5f243a16bc51471a98ec00d12906566ec4ad
Keizo Mendori [Wed, 21 Sep 2016 22:08:29 +0000 (22:08 +0000)]
Blacklist Motorola Roadster for Absolute Volume
am:
e89122a9c9
Change-Id: Id7753a999d4e7c283c901c1eb9a80666f5dda767
Keizo Mendori [Wed, 8 Jun 2016 02:40:43 +0000 (11:40 +0900)]
Blacklist Motorola Roadster for Absolute Volume
Motorola Roadster is advertizing Absolute Volume but it has a
buggy implementation.
Bug:
29740052
Change-Id: I18c1a2f03617669138be2e7e1d9c7bb391cd1129
Pavlin Radoslavov [Tue, 20 Sep 2016 22:08:24 +0000 (22:08 +0000)]
Merge changes from topics 'bt-only-pcm-media-feeding-format', 'bt-a2d-sbc-cie-localize' am:
ab8facfc57 am:
81cb76fb97
am:
1dc15ff2c1
Change-Id: I1febbea4d47b5d6b7b2724802bfd7bf0f6750bd6
Pavlin Radoslavov [Tue, 20 Sep 2016 22:08:22 +0000 (22:08 +0000)]
Use only PCM as the media feeding format am:
c66edf3144 am:
53775d4418
am:
67b773ea4c
Change-Id: I1ab9ecfaafb45da89435ea3426c2c0be890c01ad
Pavlin Radoslavov [Tue, 20 Sep 2016 22:08:20 +0000 (22:08 +0000)]
Localize the usage of tA2D_SBC_CIE only within the SBC codec am:
b18f03ecb0 am:
6e7b4a0473
am:
16a9ecca55
Change-Id: I0360f69027763370f26ded5ffc9f9193123b69e7
Pavlin Radoslavov [Tue, 20 Sep 2016 21:07:31 +0000 (21:07 +0000)]
Merge changes from topics 'bt-only-pcm-media-feeding-format', 'bt-a2d-sbc-cie-localize' am:
ab8facfc57
am:
81cb76fb97
Change-Id: Ia137673125cda68dd7e56e4bd0923d4365177dc2
Pavlin Radoslavov [Tue, 20 Sep 2016 21:07:26 +0000 (21:07 +0000)]
Use only PCM as the media feeding format am:
c66edf3144
am:
53775d4418
Change-Id: I4f3f437523db58793837bd447646c558d07c49a5
Pavlin Radoslavov [Tue, 20 Sep 2016 21:07:18 +0000 (21:07 +0000)]
Localize the usage of tA2D_SBC_CIE only within the SBC codec am:
b18f03ecb0
am:
6e7b4a0473
Change-Id: I86b799afc473b34d6b4c3dc604edd3f062fdf93e
Pavlin Radoslavov [Tue, 20 Sep 2016 20:56:06 +0000 (20:56 +0000)]
Merge changes from topics 'bt-only-pcm-media-feeding-format', 'bt-a2d-sbc-cie-localize'
am:
ab8facfc57
Change-Id: If307b1c892e394e0d273ce346f4b57fff0164068
Pavlin Radoslavov [Tue, 20 Sep 2016 20:56:05 +0000 (20:56 +0000)]
Use only PCM as the media feeding format
am:
c66edf3144
Change-Id: I053b54f9306b607f9cef3a94511b60c7815939b6
Pavlin Radoslavov [Tue, 20 Sep 2016 20:56:04 +0000 (20:56 +0000)]
Localize the usage of tA2D_SBC_CIE only within the SBC codec
am:
b18f03ecb0
Change-Id: I0aee46e8312931fa3a67f893682340dcea00ff1d
Treehugger Robot [Tue, 20 Sep 2016 20:29:39 +0000 (20:29 +0000)]
Merge changes from topics 'bt-only-pcm-media-feeding-format', 'bt-a2d-sbc-cie-localize'
* changes:
Use only PCM as the media feeding format
Localize the usage of tA2D_SBC_CIE only within the SBC codec
Jorge E. Moreira [Tue, 20 Sep 2016 19:36:21 +0000 (19:36 +0000)]
test_vendor: Use kInvalidTaskId in the controller am:
6d835905f0 am:
0a13ce1357
am:
cfe54809a3
Change-Id: I70811f225f9567a05ebfb26dc15215c6729728a0
Jorge E. Moreira [Tue, 20 Sep 2016 19:28:26 +0000 (19:28 +0000)]
test_vendor: Use kInvalidTaskId in the controller am:
6d835905f0
am:
0a13ce1357
Change-Id: Ieb65c009d7fa96bc057f9f54e052fe14ff6f22c6
Jorge E. Moreira [Tue, 20 Sep 2016 19:25:56 +0000 (19:25 +0000)]
test_vendor: Use kInvalidTaskId in the controller
am:
6d835905f0
Change-Id: I45669e742ef1e9241a5f708bbfb9253f534cbb9a
Pavlin Radoslavov [Fri, 16 Sep 2016 00:50:18 +0000 (17:50 -0700)]
Use only PCM as the media feeding format
* Removed field tA2D_AV_MEDIA_FEEDINGS.format, because we always
use/assume the feeding format is PCM.
* Removed tA2D_AV_MEDIA_FEED_CFG_PCM, tA2D_AV_MEDIA_FEED_CFG,
tA2D_AV_CODEC_PCM, and tA2D_AV_CODEC_NONE, because they are not
needed/used anymore.
* Removed feeding mode:
- tBTIF_MEDIA_INIT_AUDIO_FEEDING.feeding_mode
- tBTIF_AV_FEEDING_MODE, BTIF_AV_FEEDING_ASYNCHRONOUS,
BTIF_AV_FEEDING_SYNCHRONOUS
- tBTIF_MEDIA_CB.feeding_mode
* Added new APIs and the corresponding unit tests:
- A2D_CodecConfigMatchesCapabilities()
- A2D_BuildSinkConfig()
- A2D_CodecEquals()
- A2D_CodecRequiresReconfig()
Also:
* Removed header file btif/include/btif_av_api.h because it is not
needed anymore.
* Removed functions or typedefs that are unused or replaced:
- bta_av_co_audio_codec_match() -> replaced by
A2D_CodecConfigMatchesCapabilities()
- bta_av_co_audio_codec_cfg_matches_caps()
- bta_av_co_audio_peer_reset_config()
- bta_av_co_audio_discard_config()
- bta_av_co_get_codec_info()
- bta_av_co_peer_cp_supported()
- tA2D_AV_CODEC_ID
- tBTIF_AV_CODEC_INFO
* Increased the sampling_freq storage from uint16_t to uint32_t
* Decreased the number of channels n_channels storage from uint16_t
to uint8_t
* Removed unneessary global function declarations inside btif_av_co.h
* Changed the order of the A2D_BuildSrc2SinkConfig() arguments, so
the order is more intuitive.
* Misc other cleanup:
- file bta_av_co.cc: code simplification, renamed snk -> sink,
Removed unnecessary cast-away of a const argument: bta_av_co_cp_scmst
Renamed/updated bta_av_co_audio_peer_supports_codec() ->
bta_av_co_find_peer_sink_supports_codec()
Renamed/updated bta_av_co_audio_peer_src_supports_codec() ->
bta_av_co_find_peer_src_supports_codec()
Bug:
30958229
Test: A2DP tested manually. Unit tests included in the CL.
Change-Id: I60981c62b1a88491b5232c4f6515933c4261fac9
Ajay Panicker [Tue, 20 Sep 2016 18:43:03 +0000 (11:43 -0700)]
Remove net_bt_stack group and replace it with bluetooth
Bug:
31549206
Change-Id: I10504d73a962dde583ddb5771cb0a0fe6ca6d580
Jorge E. Moreira [Mon, 19 Sep 2016 22:58:16 +0000 (15:58 -0700)]
test_vendor: Use kInvalidTaskId in the controller
Test: make test-vendor
Change-Id: I6eefd385ecb992f854544ca92c5a8559b6f281f0
Pavlin Radoslavov [Tue, 13 Sep 2016 22:02:52 +0000 (15:02 -0700)]
Localize the usage of tA2D_SBC_CIE only within the SBC codec
* Added new A2DP API and use it as appropriate
- A2D_IsValidCodec()
- A2D_CodecTypeEquals()
- A2D_GetMinBitpool()
- A2D_GetMaxBitpool()
* Removed A2D_GetDefaultConfigSbc(), because it is not needed anymore.
* Removed bta_av_co_audio_get_sbc_config() and replaced it
with code that is not SBC codec-specific:
bta_av_co_audio_encoder_init() and bta_av_co_audio_encoder_update()
* Removed bta_av_co_get_remote_bitpool_pref() because it is
not used/needed anymore.
* Moved the following declarations the a2d_sbc.h header file to
the a2d_sbc.c codec-specific implementation, because they don't need
to be exposed anymore.
- struct tA2D_SBC_CIE
- function A2D_BldSbcInfo()
- function A2D_ParsSbcInfo()
* Added corresponding unit tests for the new API
Bug:
30958229
Test: A2DP tested manually. Unit tests included in the CL.
Change-Id: Ib242956c303f0ca3c5f70ebc00416a7a45e70228